Skip to content

Commit

Permalink
Show process name in all spawn error messages
Browse files Browse the repository at this point in the history
Refs Supervisor#87, Supervisor#629

(cherry picked from commit 8569e3f)
mnaberez authored and alexsilva committed Jun 22, 2019
1 parent b2ce0ab commit 945daae
Showing 2 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions supervisor/process.py
Original file line number Diff line number Diff line change
@@ -337,8 +337,8 @@ def spawn(self):
# too many file descriptors open
msg = 'too many open files to spawn %r' % self.config.name
else:
msg = ('unknown error making dispatchers: %s' %
errno.errorcode.get(code, code))
msg = 'unknown error making dispatchers for %r: %s' % (
self.config.name, errno.errorcode.get(code, code))
self.record_spawnerr(msg)
self._assertInState(ProcessStates.STARTING)
self.change_state(ProcessStates.BACKOFF)
14 changes: 6 additions & 8 deletions supervisor/tests/test_process.py
Original file line number Diff line number Diff line change
@@ -250,10 +250,9 @@ def test_spawn_fail_make_pipes_other(self):
events.subscribe(events.ProcessStateEvent, lambda x: L.append(x))
result = instance.spawn()
self.assertEqual(result, None)
self.assertEqual(instance.spawnerr,
'unknown error making dispatchers: EPERM')
self.assertEqual(options.logger.data[0],
"spawnerr: unknown error making dispatchers: EPERM")
msg = "unknown error making dispatchers for 'good': EPERM"
self.assertEqual(instance.spawnerr, msg)
self.assertEqual(options.logger.data[0], "spawnerr: %s" % msg)
self.assertTrue(instance.delay)
self.assertTrue(instance.backoff)
from supervisor.states import ProcessStates
@@ -280,10 +279,9 @@ def raise_eisdir(envelope):
events.subscribe(events.ProcessStateEvent, lambda x: L.append(x))
result = instance.spawn()
self.assertEqual(result, None)
self.assertEqual(instance.spawnerr,
"unknown error making dispatchers: EISDIR")
self.assertEqual(options.logger.data[0],
"spawnerr: unknown error making dispatchers: EISDIR")
msg = "unknown error making dispatchers for 'cat': EISDIR"
self.assertEqual(instance.spawnerr, msg)
self.assertEqual(options.logger.data[0], "spawnerr: %s" % msg)
self.assertTrue(instance.delay)
self.assertTrue(instance.backoff)
from supervisor.states import ProcessStates

0 comments on commit 945daae

Please sign in to comment.