[CalendarServer-changes] [11275] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 11275
          http://trac.calendarserver.org//changeset/11275
Author:   cdaboo at apple.com
Date:     2013-05-30 13:42:52 -0700 (Thu, 30 May 2013)
Log Message:
-----------
DirectoryService needs its own Logger(). SQL prop store inherits its Logger().

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/directory.py
    CalendarServer/trunk/txdav/base/propertystore/sql.py

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2013-05-30 20:41:42 UTC (rev 11274)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2013-05-30 20:42:52 UTC (rev 11275)
@@ -73,6 +73,8 @@
 class DirectoryService(object):
     implements(IDirectoryService, ICalendarStoreDirectoryService, ICredentialsChecker)
 
+    log = Logger()
+
     ##
     # IDirectoryService
     ##

Modified: CalendarServer/trunk/txdav/base/propertystore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/sql.py	2013-05-30 20:41:42 UTC (rev 11274)
+++ CalendarServer/trunk/txdav/base/propertystore/sql.py	2013-05-30 20:42:52 UTC (rev 11275)
@@ -31,7 +31,6 @@
 
 from txdav.xml.parser import WebDAVDocument
 from txdav.common.icommondatastore import AllRetriesFailed
-from twext.python.log import Logger
 from txdav.common.datastore.sql_tables import schema
 from txdav.base.propertystore.base import (AbstractPropertyStore,
                                            PropertyName, validKey)
@@ -42,7 +41,6 @@
 prop = schema.RESOURCE_PROPERTY
 
 class PropertyStore(AbstractPropertyStore):
-    log = Logger()
 
     _cacher = Memcacher("SQL.props", pickle=True, key_normalization=False)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130530/f68c8c91/attachment.html>