[CalendarServer-changes] [4611] CalendarServer/branches/users/cdaboo/deployment-partition-4593/ twistedcaldav/cluster.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Oct 20 12:08:28 PDT 2009


Revision: 4611
          http://trac.macosforge.org/projects/calendarserver/changeset/4611
Author:   cdaboo at apple.com
Date:     2009-10-20 12:08:27 -0700 (Tue, 20 Oct 2009)
Log Message:
-----------
Start all required memcacheds.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/deployment-partition-4593/twistedcaldav/cluster.py

Modified: CalendarServer/branches/users/cdaboo/deployment-partition-4593/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/users/cdaboo/deployment-partition-4593/twistedcaldav/cluster.py	2009-10-20 19:00:13 UTC (rev 4610)
+++ CalendarServer/branches/users/cdaboo/deployment-partition-4593/twistedcaldav/cluster.py	2009-10-20 19:08:27 UTC (rev 4611)
@@ -343,21 +343,22 @@
 
 
     if config.Memcached["ServerEnabled"]:
-        log.msg("Adding memcached service")
+        for name, pool in config.Memcached["Pools"].items():
+            log.msg("Adding memcached service for pool: %s" % (name,))
 
-        memcachedArgv = [
-                config.Memcached["memcached"],
-                '-p', str(config.Memcached["Port"]),
-                '-l', config.Memcached["BindAddress"]]
+            memcachedArgv = [
+                    config.Memcached["memcached"],
+                    '-p', str(pool["Port"]),
+                    '-l', pool["BindAddress"]]
+    
+            if config.Memcached["MaxMemory"] is not 0:
+                memcachedArgv.extend([
+                        '-m', str(config.Memcached["MaxMemory"])])
+    
+            memcachedArgv.extend(config.Memcached["Options"])
+    
+            monitor.addProcess('memcached-%s' % (name,), memcachedArgv, env=parentEnv)
 
-        if config.Memcached["MaxMemory"] is not 0:
-            memcachedArgv.extend([
-                    '-m', str(config.Memcached["MaxMemory"])])
-
-        memcachedArgv.extend(config.Memcached["Options"])
-
-        monitor.addProcess('memcached', memcachedArgv, env=parentEnv)
-
     if (config.Notifications["Enabled"] and
         config.Notifications["InternalNotificationHost"] == "localhost"):
         log.msg("Adding notification service")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091020/1bfd8b58/attachment.html>


More information about the calendarserver-changes mailing list