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

[source_changes at macosforge.org]

Revision: 9668
          http://trac.macosforge.org/projects/calendarserver/changeset/9668
Author:   glyph at apple.com
Date:     2012-08-11 01:55:38 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
fix fix

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/calendarserver/controlsocket.py
    CalendarServer/branches/users/glyph/q/calendarserver/tap/caldav.py

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

Modified: CalendarServer/branches/users/glyph/q/calendarserver/controlsocket.py
===================================================================
--- CalendarServer/branches/users/glyph/q/calendarserver/controlsocket.py	2012-08-11 08:55:37 UTC (rev 9667)
+++ CalendarServer/branches/users/glyph/q/calendarserver/controlsocket.py	2012-08-11 08:55:38 UTC (rev 9668)
@@ -25,7 +25,8 @@
 from twisted.protocols.amp import BinaryBoxProtocol, IBoxReceiver, IBoxSender
 from twisted.application.service import Service
 
-class DispatchingSender(IBoxSender):
+class DispatchingSender(object):
+    implements(IBoxSender)
 
     def __init__(self, sender, route):
         self.sender = sender
@@ -51,7 +52,7 @@
 
     def startReceivingBoxes(self, boxSender):
         for key, receiver in self.receiverMap.items():
-            receiver.startReceivingBoxes(DispatchingSender(self, key))
+            receiver.startReceivingBoxes(DispatchingSender(boxSender, key))
 
 
     def ampBoxReceived(self, box):
@@ -123,5 +124,5 @@
     def privilegedStartService(self):
         from twisted.internet import reactor
         endpoint = self.endpointFactory(reactor)
-        endpoint.connect(self.controlSocket).addCallback(self.clientConnected)
+        endpoint.connect(self.controlSocket)
 

Modified: CalendarServer/branches/users/glyph/q/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/q/calendarserver/tap/caldav.py	2012-08-11 08:55:37 UTC (rev 9667)
+++ CalendarServer/branches/users/glyph/q/calendarserver/tap/caldav.py	2012-08-11 08:55:38 UTC (rev 9668)
@@ -791,8 +791,8 @@
                     reactor, "127.0.0.1", id)
             controlSocketClient = ControlSocket()
             class LogClient(AMP):
-                def connectionMade(self):
-                    super(LogClient, self).connectionMade(self)
+                def startReceivingBoxes(self, sender):
+                    super(LogClient, self).startReceivingBoxes(sender)
                     logObserver.addClient(self)
             f = Factory()
             f.protocol = LogClient
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/fadcc859/attachment.html>