[CalendarServer-changes] [6851] CalendarServer/trunk/calendarserver/tools

[source_changes at macosforge.org]

Revision: 6851
          http://trac.macosforge.org/projects/calendarserver/changeset/6851
Author:   sagen at apple.com
Date:     2011-02-02 11:35:24 -0800 (Wed, 02 Feb 2011)
Log Message:
-----------
Have the command line utilities auto-disable memcached client configuration prior to setting up resource hierarchy.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/gateway.py
    CalendarServer/trunk/calendarserver/tools/principals.py
    CalendarServer/trunk/calendarserver/tools/resources.py

Modified: CalendarServer/trunk/calendarserver/tools/gateway.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/gateway.py	2011-02-02 19:07:05 UTC (rev 6850)
+++ CalendarServer/trunk/calendarserver/tools/gateway.py	2011-02-02 19:35:24 UTC (rev 6851)
@@ -112,12 +112,16 @@
 
         os.umask(config.umask)
 
+        # Configure memcached client settings prior to setting up resource
+        # hierarchy (in getDirectory)
+        setupMemcached(config)
+
         try:
             config.directory = getDirectory()
         except DirectoryError, e:
             respondWithError(str(e))
             return
-        setupMemcached(config)
+
     except ConfigurationError, e:
         respondWithError(str(e))
         return

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2011-02-02 19:07:05 UTC (rev 6850)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2011-02-02 19:35:24 UTC (rev 6851)
@@ -243,11 +243,15 @@
 
         os.umask(config.umask)
 
+        # Configure memcached client settings prior to setting up resource
+        # hierarchy (in getDirectory)
+        setupMemcached(config)
+
         try:
             config.directory = getDirectory()
         except DirectoryError, e:
             abort(e)
-        setupMemcached(config)
+
     except ConfigurationError, e:
         abort(e)
 

Modified: CalendarServer/trunk/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/resources.py	2011-02-02 19:07:05 UTC (rev 6850)
+++ CalendarServer/trunk/calendarserver/tools/resources.py	2011-02-02 19:35:24 UTC (rev 6851)
@@ -126,11 +126,15 @@
 
         os.umask(config.umask)
 
+        # Configure memcached client settings prior to setting up resource
+        # hierarchy (in getDirectory)
+        setupMemcached(config)
+
         try:
             config.directory = getDirectory()
         except DirectoryError, e:
             abort(e)
-        setupMemcached(config)
+
     except ConfigurationError, e:
         abort(e)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110202/3efc6e57/attachment.html>