msmith - in flumotion/trunk: . flumotion/component flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Wed Jul 18 19:29:04 2007
New Revision: 5327

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/feed.py
   flumotion/trunk/flumotion/manager/component.py
Log:
        * flumotion/component/feed.py:
          Call up to the right superclass.

        * flumotion/manager/component.py:
          When looking for other components to connect feeders to, only
          consider components that are fully logged in (i.e. where           
          componentAvatar.componentState != None).

          Fixes #699 - components going sad when starting multiple components
          at the same time.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jul 18 19:29:04 2007
@@ -1,5 +1,18 @@
 2007-07-18  Michael Smith <msmith at fluendo.com>
 
+	* flumotion/component/feed.py:
+	  Call up to the right superclass.
+
+	* flumotion/manager/component.py:
+	  When looking for other components to connect feeders to, only
+	  consider components that are fully logged in (i.e. where 
+	  componentAvatar.componentState != None).
+
+	  Fixes #699 - components going sad when starting multiple components
+	  at the same time.
+
+2007-07-18  Michael Smith <msmith at fluendo.com>
+
 	* flumotion/manager/component.py:
 	  Import twisted.internet.error as terror, use terror where there's a
 	  local function called error.

Modified: flumotion/trunk/flumotion/component/feed.py
==============================================================================
--- flumotion/trunk/flumotion/component/feed.py	(original)
+++ flumotion/trunk/flumotion/component/feed.py	Wed Jul 18 19:29:04 2007
@@ -49,7 +49,7 @@
             except socket.error:
                 pass
         else:
-            tcp.Server._closeSocket(self)
+            tcp._SocketCloser._closeSocket(self)
 
 class PassableClientConnection(_SocketMaybeCloser, tcp.Client):
     pass

Modified: flumotion/trunk/flumotion/manager/component.py
==============================================================================
--- flumotion/trunk/flumotion/manager/component.py	(original)
+++ flumotion/trunk/flumotion/manager/component.py	Wed Jul 18 19:29:04 2007
@@ -759,7 +759,8 @@
     def _connectFeeders(self, componentAvatar):
         flowName = componentAvatar.getParentName()
         otherComponents = [c for c in self.avatars.values()
-                           if c.getParentName() == flowName]
+                           if c.componentState != None and 
+                               c.getParentName() == flowName]
         for feederName in componentAvatar.getFeeders():
             for remoteFeedId in componentAvatar.getEatersForFeeder(
                 feederName, otherComponents):
@@ -880,6 +881,8 @@
             else:
                 self.debug("Component %s already on way to clock master", 
                     componentState.get("name"))
+        else:
+            self.warning("Component %s to be clock master, but has no avatar")
 
     def startComponent(self, componentState):
         self.debug("Component %s to be started" % componentState.get("name"))
@@ -945,7 +948,7 @@
                 self.debug("Component %s already on way to being setup", 
                     componentState.get("name"))
         else:
-            self.debug("Component %s to be setup but has no avatar yet", 
+            self.warning("Component %s to be setup but has no avatar yet", 
                 componentState.get("name"))
 
     def _doSetupComponent(self, componentAvatar):