Commit 44d36ecc authored by David Wilson's avatar David Wilson

issue #146: don't crash during on_broker_shutdown

There is some insane unidentifiable Mitogen context (the local context?)
that instantly crashes with a higher forks setting. It appears to be
harmless, but meanwhile this naturally shouldn't be happening.
parent cb620500
...@@ -531,6 +531,9 @@ class Importer(object): ...@@ -531,6 +531,9 @@ class Importer(object):
os.environ['PBR_VERSION'] = '0.0.0' os.environ['PBR_VERSION'] = '0.0.0'
def _on_load_module(self, msg): def _on_load_module(self, msg):
if msg == _DEAD:
return
tup = msg.unpickle() tup = msg.unpickle()
fullname = tup[0] fullname = tup[0]
_v and LOG.debug('Importer._on_load_module(%r)', fullname) _v and LOG.debug('Importer._on_load_module(%r)', fullname)
...@@ -1285,7 +1288,7 @@ class ExternalContext(object): ...@@ -1285,7 +1288,7 @@ class ExternalContext(object):
def _on_shutdown_msg(self, msg): def _on_shutdown_msg(self, msg):
_v and LOG.debug('_on_shutdown_msg(%r)', msg) _v and LOG.debug('_on_shutdown_msg(%r)', msg)
if msg.src_id != mitogen.parent_id: if msg != _DEAD and msg.src_id != mitogen.parent_id:
LOG.warning('Ignoring SHUTDOWN from non-parent: %r', msg) LOG.warning('Ignoring SHUTDOWN from non-parent: %r', msg)
return return
self.broker.shutdown() self.broker.shutdown()
......
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