msmith - in flumotion/trunk: . flumotion/component

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Thu Feb  1 11:35:08 2007
New Revision: 4454

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/component.py
Log:
        * flumotion/component/component.py:
          Always exit after calling stop(), even if the component stop fails
          for some reason (otherwise the component will be upstoppable).



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Feb  1 11:35:08 2007
@@ -1,3 +1,9 @@
+2007-02-01  Michael Smith  <msmith at fluendo.com>
+
+	* flumotion/component/component.py:
+	  Always exit after calling stop(), even if the component stop fails
+	  for some reason (otherwise the component will be upstoppable).
+
 2007-01-31  Michael Smith  <msmith at fluendo.com>
 
 	* README:

Modified: flumotion/trunk/flumotion/component/component.py
==============================================================================
--- flumotion/trunk/flumotion/component/component.py	(original)
+++ flumotion/trunk/flumotion/component/component.py	Thu Feb  1 11:35:08 2007
@@ -236,7 +236,9 @@
     def remote_stop(self):
         self.info('Stopping job')
         d = self.comp.stop()
-        d.addCallback(self._destroyCallback)
+        # We want to stop the process even if the component stop fails for some
+        # reason - otherwise we end up unstoppable. 
+        d.addBoth(self._destroyCallback)
 
         return d