From 153b77c4bbeb1a3d6d43d5f927f87c86c8d3ba1f Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Wed, 30 Mar 2016 15:48:44 +1000 Subject: [PATCH] hybrid: Set irc.connected after receiving EOB --- protocols/hybrid.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/protocols/hybrid.py b/protocols/hybrid.py index e34a235..d5173c5 100644 --- a/protocols/hybrid.py +++ b/protocols/hybrid.py @@ -225,7 +225,7 @@ class HybridProtocol(TS6BaseProtocol): self.irc.uplink = numeric def handle_capab(self, numeric, command, args): - # We only get a list of keywords here. Charybdis obviously assumes that + # We only get a list of keywords here. Hybrid obviously assumes that # we know what modes it supports (indeed, this is a standard list). # <- CAPAB :BAN CHW CLUSTER ENCAP EOPMOD EUID EX IE KLN KNOCK MLOCK QS RSFNC SAVE SERVICES TB UNKLN self.irc.caps = caps = args[0].split() @@ -233,9 +233,6 @@ class HybridProtocol(TS6BaseProtocol): # if required_cap not in caps: # raise ProtocolError('%s not found in TS6 capabilities list; this is required! (got %r)' % (required_cap, caps)) - log.debug('(%s) self.irc.connected set!', self.irc.name) - self.irc.connected.set() - def handle_server(self, numeric, command, args): # <- SERVER charybdis.midnight.vpn 1 :charybdis test server sname = args[0].lower() @@ -404,7 +401,9 @@ class HybridProtocol(TS6BaseProtocol): raise Exception('COULD NOT PARSE SVSTAG: {} {} {}'.format(numeric, command, args)) def handle_endburst(self, numeric, command, args): - pass + log.debug('(%s) end of burst received', self.irc.name) + log.debug('(%s) self.irc.connected set!', self.irc.name) + self.irc.connected.set() # empty handlers # TODO: there's a better way to do this