[CalendarServer-changes] [9683] CalendarServer/branches/users/glyph/q

[source_changes at macosforge.org]

Revision: 9683
          http://trac.macosforge.org/projects/calendarserver/changeset/9683
Author:   glyph at apple.com
Date:     2012-08-11 01:55:51 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
use exclusive lock, correct port attribute

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/twext/enterprise/queue.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/q/

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/queue.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/queue.py	2012-08-11 08:55:50 UTC (rev 9682)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/queue.py	2012-08-11 08:55:51 UTC (rev 9683)
@@ -1069,11 +1069,11 @@
             # If this fails, the failure mode is going to be ugly, just like all
             # conflicted-port failures.  But, at least it won't proceed.
             yield endpoint.listen(f)
-            yield Lock(NodeInfo).on(txn)
-            nodes = yield self.activeNodes()
+            yield Lock.exclusive(NodeInfo.table).on(txn)
+            nodes = yield self.activeNodes(txn)
             selves = [node for node in nodes
                       if ((node.hostname == self.hostname) and
-                          (node.port == self.port))]
+                          (node.port == self.ampPort))]
             if selves:
                 self.thisProcess = selves[0]
                 yield self.thisProcess.update(pid=self.pid,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/cdf21bcc/attachment-0001.html>