Commit 0f087833 authored by David Wilson's avatar David Wilson

core: fix NameError on disconnect

parent 198bec33
...@@ -863,7 +863,7 @@ class Context(object): ...@@ -863,7 +863,7 @@ class Context(object):
def __reduce__(self): def __reduce__(self):
return _unpickle_context, (self.context_id, self.name) return _unpickle_context, (self.context_id, self.name)
def on_disconnect(self, broker): def on_disconnect(self):
_v and LOG.debug('%r.on_disconnect()', self) _v and LOG.debug('%r.on_disconnect()', self)
fire(self, 'disconnect') fire(self, 'disconnect')
...@@ -1141,7 +1141,7 @@ class Router(object): ...@@ -1141,7 +1141,7 @@ class Router(object):
stream_ = self._stream_by_id.get(context.context_id) stream_ = self._stream_by_id.get(context.context_id)
if stream_ is stream: if stream_ is stream:
del self._stream_by_id[context.context_id] del self._stream_by_id[context.context_id]
context.on_disconnect(broker) context.on_disconnect()
def on_broker_shutdown(self): def on_broker_shutdown(self):
for context in self._context_by_id.itervalues(): for context in self._context_by_id.itervalues():
...@@ -1487,7 +1487,6 @@ class ExternalContext(object): ...@@ -1487,7 +1487,6 @@ class ExternalContext(object):
# Reopen with line buffering. # Reopen with line buffering.
sys.stdout = os.fdopen(1, 'w', 1) sys.stdout = os.fdopen(1, 'w', 1)
def _dispatch_one(self, msg): def _dispatch_one(self, msg):
data = msg.unpickle(throw=False) data = msg.unpickle(throw=False)
_v and LOG.debug('_dispatch_calls(%r)', data) _v and LOG.debug('_dispatch_calls(%r)', data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment