[CalendarServer-changes] [15432] CalendarServer/trunk/simplugin/caldavclient.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Jan 8 13:52:23 PST 2016


Revision: 15432
          http://trac.calendarserver.org//changeset/15432
Author:   sagen at apple.com
Date:     2016-01-08 13:52:22 -0800 (Fri, 08 Jan 2016)
Log Message:
-----------
Call super run( ) and stop( )

Modified Paths:
--------------
    CalendarServer/trunk/simplugin/caldavclient.py

Modified: CalendarServer/trunk/simplugin/caldavclient.py
===================================================================
--- CalendarServer/trunk/simplugin/caldavclient.py	2016-01-08 21:21:15 UTC (rev 15431)
+++ CalendarServer/trunk/simplugin/caldavclient.py	2016-01-08 21:52:22 UTC (rev 15432)
@@ -1315,6 +1315,8 @@
         """
         Emulate a CalDAV client.
         """
+
+
         @inlineCallbacks
         def startup():
             principal = yield self.startup()
@@ -1328,7 +1330,7 @@
             returnValue(calendarHome)
         calendarHome = yield self._newOperation("startup: %s" % (self.title,), startup())
 
-        self.started = True
+        yield super(BaseAppleClient, self).run()
 
         # Start monitoring PubSub notifications, if possible.
         # _checkCalendarsForEvents populates self.xmpp if it finds
@@ -1344,13 +1346,15 @@
             yield self._calendarCheckLoop(calendarHome)
 
 
+    @inlineCallbacks
     def stop(self):
         """
         Called before connections are closed, giving a chance to clean up
         """
 
+        yield super(BaseAppleClient, self).stop()
         self.serialize()
-        return self._unsubscribePubSub()
+        yield self._unsubscribePubSub()
 
 
     def serializeLocation(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160108/79b78ad3/attachment.html>


More information about the calendarserver-changes mailing list