[CalendarServer-changes] [8398] CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/ tap/cfgchild.py

[source_changes at macosforge.org]

Revision: 8398
          http://trac.macosforge.org/projects/calendarserver/changeset/8398
Author:   glyph at apple.com
Date:     2011-12-03 00:40:12 -0800 (Sat, 03 Dec 2011)
Log Message:
-----------
properly set up memcached in upgrade processes

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/cfgchild.py

Modified: CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/cfgchild.py
===================================================================
--- CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/cfgchild.py	2011-12-03 08:40:01 UTC (rev 8397)
+++ CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/cfgchild.py	2011-12-03 08:40:12 UTC (rev 8398)
@@ -26,7 +26,7 @@
     'ConfiguredChildSpawner',
 ]
 
-from calendarserver.tools.util import autoDisableMemcached
+from calendarserver.tools.util import setupMemcached
 from twisted.python.reflect import namedAny, qual
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.protocols.amp import AMP, Command, String, Integer#, ListOf
@@ -102,7 +102,7 @@
                 ProcessCount = processCount
             )
         )
-        autoDisableMemcached(self.config)
+        setupMemcached(self.config)
         if connectionPoolFD is not None:
             changedConfig.update(DBAMPFD=connectionPoolFD)
         self.config.updateDefaults(changedConfig)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111203/87eb77cb/attachment-0001.html>