[CalendarServer-changes] [6601] CalendarServer/branches/users/glyph/dont-start-postgres/ calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 6601
          http://trac.macosforge.org/projects/calendarserver/changeset/6601
Author:   glyph at apple.com
Date:     2010-11-10 18:54:36 -0800 (Wed, 10 Nov 2010)
Log Message:
-----------
Configure memcache first, as it *should* be started first, and has no dependencies of its own.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py

Modified: CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py	2010-11-11 02:54:21 UTC (rev 6600)
+++ CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py	2010-11-11 02:54:36 UTC (rev 6601)
@@ -821,6 +821,27 @@
         monitor = DelayedStartupProcessMonitor()
         s.processMonitor = monitor
 
+        for name, pool in config.Memcached.Pools.items():
+            if pool.ServerEnabled:
+                self.log_info(
+                    "Adding memcached service for pool: %s" % (name,)
+                )
+                memcachedArgv = [
+                    config.Memcached.memcached,
+                    "-p", str(pool.Port),
+                    "-l", pool.BindAddress,
+                    "-U", "0",
+                ]
+                if config.Memcached.MaxMemory is not 0:
+                    memcachedArgv.extend(
+                        ["-m", str(config.Memcached.MaxMemory)]
+                    )
+                if config.UserName:
+                    memcachedArgv.extend(["-u", config.UserName])
+                memcachedArgv.extend(config.Memcached.Options)
+                monitor.addProcess('memcached-%s' % (name,), memcachedArgv,
+                                   env=PARENT_ENVIRONMENT)
+
         ssvc = self.storageService(monitor, uid, gid)
         ssvc.setServiceParent(s)
 
@@ -847,7 +868,6 @@
 
 
         # Open the socket(s) to be inherited by the slaves
-
         inheritFDs = []
         inheritSSLFDs = []
 
@@ -888,27 +908,6 @@
                         sock = _openSocket(bindAddress, int(portNum))
                         inheritSSLFDs.append(sock.fileno())
 
-        for name, pool in config.Memcached.Pools.items():
-            if pool.ServerEnabled:
-                self.log_info("Adding memcached service for pool: %s" % (name,))
-
-                memcachedArgv = [
-                    config.Memcached.memcached,
-                    "-p", str(pool.Port),
-                    "-l", pool.BindAddress,
-                    "-U", "0",
-                ]
-
-                if config.Memcached.MaxMemory is not 0:
-                    memcachedArgv.extend(["-m", str(config.Memcached.MaxMemory)])
-                if config.UserName:
-                    memcachedArgv.extend(["-u", config.UserName])
-
-                memcachedArgv.extend(config.Memcached.Options)
-
-                monitor.addProcess('memcached-%s' % (name,), memcachedArgv,
-                                   env=PARENT_ENVIRONMENT)
-
         self.addSlaveProcesses(
             monitor, dispenser, cl.dispatcher, options["config"],
             inheritFDs=inheritFDs, inheritSSLFDs=inheritSSLFDs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101110/d9eb5a54/attachment-0001.html>