[CalendarServer-changes] [7423] CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/ cluster.py

[source_changes at macosforge.org]

Revision: 7423
          http://trac.macosforge.org/projects/calendarserver/changeset/7423
Author:   glyph at apple.com
Date:     2011-05-09 19:34:17 -0700 (Mon, 09 May 2011)
Log Message:
-----------
Log an exception when removing the socket if it dies in reactor internals.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py	2011-05-06 22:21:36 UTC (rev 7422)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py	2011-05-10 02:34:17 UTC (rev 7423)
@@ -101,7 +101,10 @@
         Re-initialize the meta-socket, if this process is using one.
         """
         if self.metaSocket is not None:
-            self.dispatcher.removeSocket(self.metaSocket)
+            try:
+                self.dispatcher.removeSocket(self.metaSocket)
+            except OSError:
+                log.err("Exception while removing socket; probably bad FD.")
             self.metaSocket = None
         if self.dispatcher is not None:
             self.metaSocket = self.dispatcher.addSocket()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110509/21f9129e/attachment.html>