Browse Source

- Fix bug where stopping process would cause process output that happened
after the stop request was issued to be lost. See
https://github.com/Supervisor/supervisor/issues/11.

Closes #11.

Chris McDonough 14 years ago
parent
commit
e19cbc185d
3 changed files with 4 additions and 2 deletions
  1. 4 0
      CHANGES.txt
  2. 0 1
      src/supervisor/process.py
  3. 0 1
      src/supervisor/tests/test_process.py

+ 4 - 0
CHANGES.txt

@@ -21,6 +21,10 @@ Next release
     ``[supervisord]`` section had no effect.  Thanks to Wyatt Baldwin
     for a patch.
 
+  - Fix bug where stopping process would cause process output that happened
+    after the stop request was issued to be lost.  See
+    https://github.com/Supervisor/supervisor/issues/11.
+
 3.0a9 (2010-08-13)
 
   - Use rich comparison methods rather than __cmp__ to sort process

+ 0 - 1
src/supervisor/process.py

@@ -341,7 +341,6 @@ class Subprocess:
 
     def stop(self):
         """ Administrative stop """
-        self.drain()
         self.administrative_stop = 1
         return self.kill(self.config.stopsignal)
 

+ 0 - 1
src/supervisor/tests/test_process.py

@@ -608,7 +608,6 @@ class SubprocessTests(unittest.TestCase):
                          'signal SIGTERM')
         self.assertEqual(instance.killing, 1)
         self.assertEqual(options.kills[11], signal.SIGTERM)
-        self.assertEqual(dispatcher.write_event_handled, True)
 
     def test_give_up(self):
         options = DummyOptions()