[CalendarServer-changes] [13924] CalendarServer/trunk/calendarserver/tap/caldav.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Aug 28 15:35:37 PDT 2014


Revision: 13924
          http://trac.calendarserver.org//changeset/13924
Author:   sagen at apple.com
Date:     2014-08-28 15:35:37 -0700 (Thu, 28 Aug 2014)
Log Message:
-----------
Don't run the pre-flight TLS cert check if you're the agent or a command line utility -- you're not using that cert, silly!

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2014-08-28 01:53:20 UTC (rev 13923)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2014-08-28 22:35:37 UTC (rev 13924)
@@ -1405,8 +1405,10 @@
             return config.UtilityServiceClass(store)
 
         uid, gid = getSystemIDs(config.UserName, config.GroupName)
-        return self.storageService(toolServiceCreator, None, uid=uid, gid=gid,
-                                   directory=None)
+        return self.storageService(
+            toolServiceCreator, None, uid=uid, gid=gid, directory=None,
+            preFlightChecks=False
+        )
 
 
     def makeService_Agent(self, options):
@@ -1442,7 +1444,9 @@
             return makeAgentService(store)
 
         uid, gid = getSystemIDs(config.UserName, config.GroupName)
-        svc = self.storageService(agentServiceCreator, None, uid=uid, gid=gid)
+        svc = self.storageService(
+            agentServiceCreator, None, uid=uid, gid=gid, preFlightChecks=False
+        )
         agentLoggingService = ErrorLoggingMultiService(
             config.ErrorLogEnabled,
             config.AgentLogFile,
@@ -1454,7 +1458,8 @@
 
 
     def storageService(
-        self, createMainService, logObserver, uid=None, gid=None, directory=None
+        self, createMainService, logObserver, uid=None, gid=None, directory=None,
+        preFlightChecks=True
     ):
         """
         If necessary, create a service to be started used for storage; for
@@ -1581,9 +1586,10 @@
                     )
                 )
 
-                pps.addStep(
-                    PreFlightChecksStep(config)
-                )
+                if preFlightChecks:
+                    pps.addStep(
+                        PreFlightChecksStep(config)
+                    )
 
                 pps.addStep(
                     UpgradeReleaseLockStep(store)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140828/6a2ffbf8/attachment.html>


More information about the calendarserver-changes mailing list