April 2007 - calendarserver-changes

[1505] PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src
by source_changes＠macosforge.org 30 Apr '07

30 Apr '07

Revision: 1505 http://trac.macosforge.org/projects/calendarserver/changeset/1505 Author: cdaboo(a)apple.com Date: 2007-04-30 08:20:40 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Add more information to the Python exception that gets raised so we can do some more detailed debugging. Modified Paths: -------------- PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.cpp PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.h Modified: PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.cpp =================================================================== --- PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.cpp 2007-04-30 14:32:47 UTC (rev 1504) +++ PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.cpp 2007-04-30 15:20:40 UTC (rev 1505) @@ -31,8 +31,8 @@ extern PyObject* ODException_class; -# define ThrowIfDSErr(x) { long dirStatus = x; if (dirStatus != eDSNoErr) throw dirStatus; } -# define ThrowIfNULL(x) { if (x == NULL) throw -1L; } +# define ThrowIfDSErr(x) { if (x != eDSNoErr) ThrowDSError(x, __FILE__, __LINE__); } +# define ThrowIfNULL(x) { if (x == NULL) ThrowDSError(-1, __FILE__, __LINE__); } // This is copied from WhitePages #define kDSStdRecordTypeResources "dsRecTypeStandard:Resources" @@ -96,9 +96,9 @@ // Get attribute map return _ListAllRecordsWithAttributes(recordType, NULL, attributes); } - catch(long dserror) + catch(SDirectoryServiceException& dserror) { - PyErr_SetObject(ODException_class, Py_BuildValue("((s:i))", "DirectoryServices Error", dserror)); + SetPythonException(dserror); return NULL; } catch(...) @@ -129,9 +129,9 @@ // Get attribute map return _QueryRecordsWithAttributes(attr, value, matchType, NULL, casei, recordType, attributes); } - catch(long dserror) + catch(SDirectoryServiceException& dserror) { - PyErr_SetObject(ODException_class, Py_BuildValue("((s:i))", "DirectoryServices Error", dserror)); + SetPythonException(dserror); return NULL; } catch(...) @@ -160,9 +160,9 @@ // Get attribute map return _QueryRecordsWithAttributes(NULL, NULL, 0, query, casei, recordType, attributes); } - catch(long dserror) + catch(SDirectoryServiceException& dserror) { - PyErr_SetObject(ODException_class, Py_BuildValue("((s:i))", "DirectoryServices Error", dserror)); + SetPythonException(dserror); return NULL; } catch(...) @@ -188,9 +188,9 @@ result = NativeAuthenticationBasic(guid, user, pswd); return true; } - catch(long dserror) + catch(SDirectoryServiceException& dserror) { - PyErr_SetObject(ODException_class, Py_BuildValue("((s:i))", "DirectoryServices Error", dserror)); + SetPythonException(dserror); return false; } catch(...) @@ -216,9 +216,9 @@ result = NativeAuthenticationDigest(guid, user, challenge, response, method); return true; } - catch(long dserror) + catch(SDirectoryServiceException& dserror) { - PyErr_SetObject(ODException_class, Py_BuildValue("((s:i))", "DirectoryServices Error", dserror)); + SetPythonException(dserror); return false; } catch(...) @@ -390,7 +390,7 @@ CloseNode(); CloseService(); } - catch(long dsStatus) + catch(SDirectoryServiceException& dsStatus) { // Cleanup if (context != NULL) @@ -624,7 +624,7 @@ CloseNode(); CloseService(); } - catch(long dsStatus) + catch(SDirectoryServiceException& dsStatus) { // Cleanup if (context != NULL) @@ -800,7 +800,7 @@ long aDataBufSize = sizeof(long) + ::strlen(user) + sizeof(long) + ::strlen(pswd); authData = ::dsDataBufferAllocate(mDir, aDataBufSize); if (authData == NULL) - throw eDSNullDataBuff; + ThrowIfDSErr(eDSNullDataBuff); long aCurLength = 0; long aTempLength = ::strlen(user); ::memcpy(&(authData->fBufferData[aCurLength]), &aTempLength, sizeof(long)); @@ -926,7 +926,7 @@ sizeof(long) + ::strlen(method); authData = ::dsDataBufferAllocate(mDir, aDataBufSize); if (authData == NULL) - throw eDSNullDataBuff; + ThrowIfDSErr(eDSNullDataBuff); long aCurLength = 0; long aTempLength = ::strlen(user); ::memcpy(&(authData->fBufferData[aCurLength]), &aTempLength, sizeof(long)); @@ -1009,7 +1009,7 @@ if (dirStatus != eDSNoErr) { mDir = 0L; - throw dirStatus; + ThrowIfDSErr(dirStatus); } } } @@ -1065,7 +1065,7 @@ else { result = NULL; - throw dirStatus; + ThrowIfDSErr(dirStatus); } dirStatus = ::dsDataListDeallocate(mDir, nodePath); free(nodePath); @@ -1110,7 +1110,7 @@ mData = ::dsDataBufferAllocate(mDir, cBufferSize); if (mData == NULL) { - throw eDSNullDataBuff; + ThrowIfDSErr(eDSNullDataBuff); } mDataSize = cBufferSize; } @@ -1139,7 +1139,7 @@ mData = ::dsDataBufferAllocate(mDir, 2 * mDataSize); if (mData == NULL) { - throw eDSNullDataBuff; + ThrowIfDSErr(eDSNullDataBuff); } mDataSize *= 2; } @@ -1184,3 +1184,19 @@ result[len] = 0; return result; } + +void CDirectoryService::ThrowDSError(long error, const char* file, long line) +{ + CDirectoryService::SDirectoryServiceException dirStatus; + dirStatus.mDSError = error; + ::snprintf(dirStatus.mDescription, 1024, "Exception raised in file %s at line %ld", file, line); + throw dirStatus; +} + +void CDirectoryService::SetPythonException(const SDirectoryServiceException& ex) +{ + char error[1024]; + ::snprintf(error, 1024, "%s %s", "DirectoryServices Error:", ex.mDescription); + PyErr_SetObject(ODException_class, Py_BuildValue("((s:i))", error, ex.mDSError)); +} + Modified: PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.h =================================================================== --- PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.h 2007-04-30 14:32:47 UTC (rev 1504) +++ PyOpenDirectory/branches/users/cdaboo/better-errors-1318/src/CDirectoryService.h 2007-04-30 15:20:40 UTC (rev 1505) @@ -40,6 +40,13 @@ bool AuthenticateUserDigest(const char* guid, const char* user, const char* challenge, const char* response, const char* method, bool& result); private: + + struct SDirectoryServiceException + { + long mDSError; + char mDescription[1024]; + }; + const char* mNodeName; tDirReference mDir; tDirNodeReference mNode; @@ -70,4 +77,7 @@ char* CStringFromBuffer(tDataBufferPtr data); char* CStringFromData(const char* data, size_t len); + + void ThrowDSError(long error, const char* file, long line); + void SetPythonException(const SDirectoryServiceException& ex); };

1 0

[1504] PyOpenDirectory/branches/users/cdaboo/better-errors-1318/
by source_changes＠macosforge.org 30 Apr '07

30 Apr '07

Revision: 1504 http://trac.macosforge.org/projects/calendarserver/changeset/1504 Author: cdaboo(a)apple.com Date: 2007-04-30 07:32:47 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Branch to add more detail to exceptions. Added Paths: ----------- PyOpenDirectory/branches/users/cdaboo/better-errors-1318/ Copied: PyOpenDirectory/branches/users/cdaboo/better-errors-1318 (from rev 1503, PyOpenDirectory/trunk)

1 0

[1503] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 28 Apr '07

28 Apr '07

Revision: 1503 http://trac.macosforge.org/projects/calendarserver/changeset/1503 Author: dreid(a)apple.com Date: 2007-04-27 18:07:43 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Rename the option because we actually support deflate & gzip though it's only one response filter (sorry no compress support) Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/root.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2007-04-27 22:20:45 UTC (rev 1502) +++ CalendarServer/trunk/twistedcaldav/config.py 2007-04-28 01:07:43 UTC (rev 1503) @@ -177,8 +177,9 @@ # crypto operations and shared by multiple server processes "SharedSecret": "", - # Support for the gzip Content-Encoding as specified in RFC2616 Section 3.5 - "GZipEncoding": True, + # Support for Content-Encoding compression options as specified in + # RFC2616 Section 3.5 + "ResponseCompression": True, } class Config (object): Modified: CalendarServer/trunk/twistedcaldav/root.py =================================================================== --- CalendarServer/trunk/twistedcaldav/root.py 2007-04-27 22:20:45 UTC (rev 1502) +++ CalendarServer/trunk/twistedcaldav/root.py 2007-04-28 01:07:43 UTC (rev 1503) @@ -53,7 +53,7 @@ self.contentFilters = [] - if config.GZipEncoding: + if config.ResponseCompression: from twisted.web2.filter import gzip self.contentFilters.append((gzip.gzipfilter, True))

1 0

[1502] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 27 Apr '07

27 Apr '07

Revision: 1502 http://trac.macosforge.org/projects/calendarserver/changeset/1502 Author: dreid(a)apple.com Date: 2007-04-27 15:20:45 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Add support for and a config option for control of GZip Content-Encoding (see RFC 2616 Section 3.5) Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/root.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2007-04-27 22:19:52 UTC (rev 1501) +++ CalendarServer/trunk/twistedcaldav/config.py 2007-04-27 22:20:45 UTC (rev 1502) @@ -172,10 +172,13 @@ # A unix socket used for communication between the child and master # processes. "ControlSocket": "/var/run/caldavd.sock", - + # A secret key (SHA-1 hash of random string) that is used for internal # crypto operations and shared by multiple server processes "SharedSecret": "", + + # Support for the gzip Content-Encoding as specified in RFC2616 Section 3.5 + "GZipEncoding": True, } class Config (object): Modified: CalendarServer/trunk/twistedcaldav/root.py =================================================================== --- CalendarServer/trunk/twistedcaldav/root.py 2007-04-27 22:19:52 UTC (rev 1501) +++ CalendarServer/trunk/twistedcaldav/root.py 2007-04-27 22:20:45 UTC (rev 1502) @@ -34,6 +34,7 @@ class RootResource(DAVFile): """ A special root resource that contains support checking SACLs + as well as adding responseFilters. """ useSacls = False @@ -50,6 +51,12 @@ "config.EnableSACLs is True, SACLs will not be" "turned on.")) + self.contentFilters = [] + + if config.GZipEncoding: + from twisted.web2.filter import gzip + self.contentFilters.append((gzip.gzipfilter, True)) + def checkSacl(self, request): """ Check SACLs against the current request @@ -92,6 +99,9 @@ return d def locateChild(self, request, segments): + for filter in self.contentFilters: + request.addResponseFilter(filter[0], atEnd=filter[1]) + if self.useSacls: d = self.checkSacl(request) d.addCallback(lambda _: super(RootResource, self

1 0

[1501] CalendarServer/trunk/support/Makefile.Apple
by source_changes＠macosforge.org 27 Apr '07

27 Apr '07

Revision: 1501 http://trac.macosforge.org/projects/calendarserver/changeset/1501 Author: dreid(a)apple.com Date: 2007-04-27 15:19:52 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Don't nuke the __init__.py because we've already patched it to not be so dumb. Modified Paths: -------------- CalendarServer/trunk/support/Makefile.Apple Modified: CalendarServer/trunk/support/Makefile.Apple =================================================================== --- CalendarServer/trunk/support/Makefile.Apple 2007-04-26 18:44:05 UTC (rev 1500) +++ CalendarServer/trunk/support/Makefile.Apple 2007-04-27 22:19:52 UTC (rev 1501) @@ -88,8 +88,6 @@ $(_v) rm -f "$(DSTROOT)$(SHAREDIR)/caldavd/lib/python/twisted/python/zshcomp.py" $(_v) rm -f "$(DSTROOT)$(SHAREDIR)/caldavd/lib/python/twisted/python/zshcomp.pyc" $(_v) rm -f "$(DSTROOT)$(SHAREDIR)/caldavd/lib/python/twisted/python/_twisted_zsh_stub" - $(_v) echo "# Don't load all plugins off of PYTHONPATH" > "$(DSTROOT)$(SHAREDIR)/caldavd/lib/python/twisted/plugins/__init__.py" - $(_v) rm -f "$(DSTROOT)$(SHAREDIR)/caldavd/lib/python/twisted/plugins/__init__.pyc" install:: $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(MANDIR)/man8

1 0

[1500] CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__. patch
by source_changes＠macosforge.org 26 Apr '07

26 Apr '07

Revision: 1500 http://trac.macosforge.org/projects/calendarserver/changeset/1500 Author: dreid(a)apple.com Date: 2007-04-26 11:44:05 -0700 (Thu, 26 Apr 2007) Log Message: ----------- Patch the correct path. Modified Paths: -------------- CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch =================================================================== --- CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch 2007-04-26 18:39:00 UTC (rev 1499) +++ CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch 2007-04-26 18:44:05 UTC (rev 1500) @@ -1,7 +1,7 @@ -Index: __init__.py +Index: twisted/plugins/__init__.py =================================================================== ---- __init__.py (revision 19773) -+++ __init__.py (working copy) +--- twisted/plugins/__init__.py (revision 19773) ++++ twisted/plugins/__init__.py (working copy) @@ -12,6 +12,6 @@ """

1 0

[1499] CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__. patch
by source_changes＠macosforge.org 26 Apr '07

26 Apr '07

Revision: 1499 http://trac.macosforge.org/projects/calendarserver/changeset/1499 Author: dreid(a)apple.com Date: 2007-04-26 11:39:00 -0700 (Thu, 26 Apr 2007) Log Message: ----------- Patch our Twisted to not look in /System/ for directories to add twisted/plugins/ to Added Paths: ----------- CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch Added: CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch =================================================================== --- CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch (rev 0) +++ CalendarServer/trunk/lib-patches/Twisted/twisted.plugins.__init__.patch 2007-04-26 18:39:00 UTC (rev 1499) @@ -0,0 +1,12 @@ +Index: __init__.py +=================================================================== +--- __init__.py (revision 19773) ++++ __init__.py (working copy) +@@ -12,6 +12,6 @@ + """ + + import os, sys +-__path__ = [os.path.abspath(os.path.join(x, 'twisted', 'plugins')) for x in sys.path] ++__path__ = [os.path.abspath(os.path.join(x, 'twisted', 'plugins')) for x in sys.path if not x.startswith('/System')] + + __all__ = [] # nothing to see here, move along, move along

1 0

[1498] CalendarServer/trunk/twistedcaldav/extensions.py
by source_changes＠macosforge.org 25 Apr '07

25 Apr '07

Revision: 1498 http://trac.macosforge.org/projects/calendarserver/changeset/1498 Author: wsanchez(a)apple.com Date: 2007-04-24 17:36:46 -0700 (Tue, 24 Apr 2007) Log Message: ----------- Add XMLResponse Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/extensions.py Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2007-04-24 18:49:12 UTC (rev 1497) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2007-04-25 00:36:46 UTC (rev 1498) @@ -538,3 +538,15 @@ def writeProperty(self, property, request): raise HTTPError(self.readOnlyResponse) + +class XMLResponse (Response): + """ + XML L{Response} object. + Renders itself as an XML document. + """ + def __init__(self, code, element): + """ + @param xml_responses: an interable of davxml.Response objects. + """ + Response.__init__(self, code, stream=element.toxml()) + self.headers.setHeader("content-type", MimeType("text", "xml"))

1 0

[1497] CalendarServer/trunk/twistedcaldav/test/test_tap.py
by source_changes＠macosforge.org 24 Apr '07

24 Apr '07

Revision: 1497 http://trac.macosforge.org/projects/calendarserver/changeset/1497 Author: dreid(a)apple.com Date: 2007-04-24 11:49:12 -0700 (Tue, 24 Apr 2007) Log Message: ----------- Fix some ridiculously fragile unit tests :" Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/test/test_tap.py Modified: CalendarServer/trunk/twistedcaldav/test/test_tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-04-24 18:34:04 UTC (rev 1496) +++ CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-04-24 18:49:12 UTC (rev 1497) @@ -419,10 +419,10 @@ site = self.getSite() self.failUnless(isinstance( - site.resource.resource.resource, + site.resource.resource, auth.AuthenticationWrapper)) - authWrapper = site.resource.resource.resource + authWrapper = site.resource.resource expectedSchemes = ['negotiate', 'digest', 'basic'] @@ -442,7 +442,7 @@ self.writeConfig() site = self.getSite() - authWrapper = site.resource.resource.resource + authWrapper = site.resource.resource ncf = authWrapper.credentialFactories['negotiate'] self.assertEquals(ncf.service, 'http/hello') @@ -458,7 +458,7 @@ self.writeConfig() site = self.getSite() - authWrapper = site.resource.resource.resource + authWrapper = site.resource.resource ncf = authWrapper.credentialFactories['negotiate'] self.assertEquals(ncf.service, 'http/hello@bob') @@ -477,7 +477,7 @@ self.writeConfig() site = self.getSite() - authWrapper = site.resource.resource.resource + authWrapper = site.resource.resource expectedSchemes = ['digest'] @@ -495,7 +495,7 @@ site = self.getSite() self.failUnless(isinstance( - site.resource.resource, + site.resource, LogWrapperResource)) def test_rootResource(self): @@ -503,7 +503,7 @@ Test the root resource """ site = self.getSite() - root = site.resource.resource.resource.resource + root = site.resource.resource.resource self.failUnless(isinstance(root, CalDAVServiceMaker.rootResourceClass)) @@ -512,7 +512,7 @@ Test the principal resource """ site = self.getSite() - root = site.resource.resource.resource.resource + root = site.resource.resource.resource self.failUnless(isinstance( root.getChild('principals'), @@ -523,7 +523,7 @@ Test the calendar resource """ site = self.getSite() - root = site.resource.resource.resource.resource + root = site.resource.resource.resource self.failUnless(isinstance( root.getChild('calendars'), @@ -560,8 +560,8 @@ to the same DirectoryService as the calendar hierarchy """ site = self.getSite() - principals = site.resource.resource.resource.resource.getChild('principals') - calendars = site.resource.resource.resource.resource.getChild('calendars') + principals = site.resource.resource.resource.getChild('principals') + calendars = site.resource.resource.resource.getChild('calendars') self.assertEquals(principals.directory, calendars.directory) @@ -572,7 +572,7 @@ an AggregateDirectoryService """ site = self.getSite() - principals = site.resource.resource.resource.resource.getChild('principals') + principals = site.resource.resource.resource.getChild('principals') directory = principals.directory self.failUnless(isinstance( @@ -591,7 +591,7 @@ open(self.config['SudoersFile'], 'w').write(sudoersFile) site = self.getSite() - principals = site.resource.resource.resource.resource.getChild('principals') + principals = site.resource.resource.resource.getChild('principals') directory = principals.directory self.failUnless(self.config['SudoersFile']) @@ -614,7 +614,7 @@ self.writeConfig() site = self.getSite() - principals = site.resource.resource.resource.resource.getChild('principals') + principals = site.resource.resource.resource.getChild('principals') directory = principals.directory self.failUnless(self.config['SudoersFile']) @@ -630,7 +630,7 @@ the SudoersFile is not configured """ site = self.getSite() - principals = site.resource.resource.resource.resource.getChild('principals') + principals = site.resource.resource.resource.getChild('principals') directory = principals.directory self.failIf(self.config['SudoersFile']) @@ -646,7 +646,7 @@ set in the configuration file. """ site = self.getSite() - principals = site.resource.resource.resource.resource.getChild('principals') + principals = site.resource.resource.resource.getChild('principals') directory = principals.directory realDirectory = directory.serviceForRecordType('users')

1 0

[1496] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 24 Apr '07

24 Apr '07

Revision: 1496 http://trac.macosforge.org/projects/calendarserver/changeset/1496 Author: dreid(a)apple.com Date: 2007-04-24 11:34:04 -0700 (Tue, 24 Apr 2007) Log Message: ----------- Ok this does two things: 1) it fixes #162 which it does by 2) allowing you to specify deep overrides on the command line using '/' seperated paths. For example -o MultiProcess/ProcessCount=1 So #162 is fixed by telling all subprocesses how many process their are, then for the ProcessCount=1 case we don't try to hook up the PDClientAddressWrapper hack. Fixes #162 Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/cluster.py CalendarServer/trunk/twistedcaldav/tap.py CalendarServer/trunk/twistedcaldav/test/test_tap.py Modified: CalendarServer/trunk/twistedcaldav/cluster.py =================================================================== --- CalendarServer/trunk/twistedcaldav/cluster.py 2007-04-24 17:41:18 UTC (rev 1495) +++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-04-24 18:34:04 UTC (rev 1496) @@ -56,7 +56,8 @@ class TwistdSlaveProcess(object): prefix = "caldav" - def __init__(self, twistd, tapname, configFile, interfaces, port, sslPort): + def __init__(self, twistd, tapname, configFile, + interfaces, port, sslPort): self.twistd = twistd self.tapname = tapname @@ -94,8 +95,11 @@ '-o', 'BindSSLPorts=%s' % (','.join(map(str, self.sslPorts)),), '-o', 'PIDFile=None', '-o', 'ErrorLogFile=None', - '-o', 'SharedSecret=%s' % (config.SharedSecret,)]) + '-o', 'SharedSecret=%s' % (config.SharedSecret,), + '-o', 'MultiProcess/ProcessCount=%d' % ( + config.MultiProcess['ProcessCount'],)]) + return args def getHostLine(self, ssl=None): Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2007-04-24 17:41:18 UTC (rev 1495) +++ CalendarServer/trunk/twistedcaldav/tap.py 2007-04-24 18:34:04 UTC (rev 1496) @@ -25,6 +25,7 @@ import os import stat import sys +import copy from zope.interface import implements @@ -97,6 +98,49 @@ self.overrides = {} + def _coerceOption(self, configDict, key, value): + """ + Coerce the given C{val} to type of C{configDict[key]} + """ + if key in configDict: + if isinstance(configDict[key], bool): + value = value == "True" + + elif isinstance(configDict[key], (int, float, long)): + value = type(configDict[key])(value) + + elif isinstance(configDict[key], (list, tuple)): + value = value.split(',') + + elif isinstance(configDict[key], dict): + raise UsageError("Dict options not supported on the command line") + + elif value == 'None': + value = None + + return value + + def _setOverride(self, configDict, path, value, overrideDict): + """ + Set the value at path in configDict + """ + key = path[0] + + if len(path) == 1: + overrideDict[key] = self._coerceOption(configDict, key, value) + return + + if key in configDict: + if not isinstance(configDict[key], dict): + raise UsageError( + "Found intermediate path element that is not a dictionary") + + if key not in overrideDict: + overrideDict[key] = {} + + self._setOverride( + configDict[key], path[1:], value, overrideDict[key]) + def opt_option(self, option): """ Set an option to override a value in the config file. True, False, int, @@ -106,25 +150,9 @@ """ if '=' in option: - key, value = option.split('=') - - if key in defaultConfig: - if isinstance(defaultConfig[key], bool): - value = value == "True" - - elif isinstance(defaultConfig[key], (int, float, long)): - value = type(defaultConfig[key])(value) - - elif isinstance(defaultConfig[key], (list, tuple)): - value = value.split(',') - - elif isinstance(defaultConfig[key], dict): - raise UsageError("Dict options not supported on the command line") - - elif value == 'None': - value = None - - self.overrides[key] = value + path, value = option.split('=') + self._setOverride( + defaultConfig, path.split('/'), value, self.overrides) else: self.opt_option('%s=True' % (option,)) @@ -457,10 +485,13 @@ log.msg("Setting up service") if config.ProcessType == 'Slave': - realRoot = pdmonster.PDClientAddressWrapper( - logWrapper, - config.PythonDirector['ControlSocket'] - ) + if config.MultiProcess['ProcessCount'] > 1: + realRoot = pdmonster.PDClientAddressWrapper( + logWrapper, + config.PythonDirector['ControlSocket'] + ) + else: + realRoot = logWrapper logObserver = logging.AMPCommonAccessLoggingObserver(config.ControlSocket) Modified: CalendarServer/trunk/twistedcaldav/test/test_tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-04-24 17:41:18 UTC (rev 1495) +++ CalendarServer/trunk/twistedcaldav/test/test_tap.py 2007-04-24 18:34:04 UTC (rev 1496) @@ -154,7 +154,17 @@ self.assertEquals(config.Authentication['Basic']['Enabled'], myConfig['Authentication']['Basic']['Enabled']) + def test_specifyDictPath(self): + """ + Test that we can specify command line overrides to leafs using + a '/' seperated path. Such as '-o MultiProcess/ProcessCount=1' + """ + argv = ['-o', 'MultiProcess/ProcessCount=102'] + self.config.parseOptions(argv) + + self.assertEquals(config.MultiProcess['ProcessCount'], 102) + class BaseServiceMakerTests(unittest.TestCase): """ Utility class for ServiceMaker tests.

1 0