[CalendarServer-changes] [2320] CalendarServer/branches/users/wsanchez/logging/twistedcaldav

source_changes at macosforge.org source_changes at macosforge.org
Wed Apr 16 12:21:40 PDT 2008


Revision: 2320
          http://trac.macosforge.org/projects/calendarserver/changeset/2320
Author:   wsanchez at apple.com
Date:     2008-04-16 12:21:39 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
Use new log.py hooey.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/caldavxml.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/cluster.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/config.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/digest.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/directory.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/principal.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/dropbox.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/extensions.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/ical.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/index.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/logging.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/copymove.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/mkcalendar.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/propfind.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put_common.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_calquery.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_common.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_freebusy.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_multiget.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/root.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/sql.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/static.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/tap.py
    CalendarServer/branches/users/wsanchez/logging/twistedcaldav/timezones.py

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/caldavxml.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/caldavxml.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -25,19 +25,20 @@
 See draft spec: http://ietf.webdav.org/caldav/draft-dusseault-caldav.txt
 """
 
-from twisted.python import log
+import datetime
 
+from vobject.icalendar import utc
+
 from twisted.web2.dav import davxml
 
 from twistedcaldav.dateops import clipPeriod, timeRangesOverlap
 from twistedcaldav.ical import Component as iComponent
 from twistedcaldav.ical import Property as iProperty
 from twistedcaldav.ical import parse_date_or_datetime
+from twistedcaldav.log import Logger
 
-from vobject.icalendar import utc
+log = Logger()
 
-import datetime
-
 ##
 # CalDAV objects
 ##

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/cluster.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/cluster.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -18,16 +18,16 @@
 import sys
 import tempfile
 
-from twisted.python import log
-
 from twisted.runner import procmon
 from twisted.application import internet, service
 
 from twistedcaldav import logging
 from twistedcaldav.config import config, ConfigurationError
-
 from twistedcaldav.util import getNCPU
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 serviceTemplate = """
     <service name="%(name)s">
         %(listeningInterfaces)s

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/config.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/config.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -17,10 +17,12 @@
 import os
 import copy
 
-from twisted.python import log
 
 from twistedcaldav.py.plistlib import readPlist
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 defaultConfigFile = "/etc/caldavd/caldavd.plist"
 
 serviceDefaultParams = {

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/digest.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/digest.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/digest.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -17,7 +17,6 @@
 from twistedcaldav.sql import AbstractSQLDatabase
 
 from twisted.cred import error
-from twisted.python import log
 from twisted.web2.auth.digest import DigestCredentialFactory
 from twisted.web2.auth.digest import DigestedCredentials
 
@@ -32,6 +31,10 @@
 except ImportError:
     from pysqlite2.dbapi2 import OperationalError
 
+from twistedcaldav.log import Logger
+
+log = Logger()
+
 """
 Overrides twisted.web2.auth.digest to allow specifying a qop value as a configuration parameter.
 Also adds an sqlite-based credentials cache that is multi-process safe.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/directory.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/directory.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -30,14 +30,16 @@
 
 from zope.interface import implements
 
-from twisted.python import log
 from twisted.cred.error import UnauthorizedLogin
 from twisted.cred.checkers import ICredentialsChecker
 from twisted.web2.dav.auth import IPrincipalCredentials
 
 from twistedcaldav.directory.idirectory import IDirectoryService, IDirectoryRecord
 from twistedcaldav.directory.util import uuidFromName
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 class DirectoryService(object):
     implements(IDirectoryService, ICredentialsChecker)
 

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/principal.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/directory/principal.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -31,7 +31,6 @@
 from urllib import unquote
 from urlparse import urlparse
 
-from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.internet.defer import succeed
 from twisted.web2 import responsecode
@@ -48,7 +47,10 @@
 from twistedcaldav.resource import CalendarPrincipalCollectionResource, CalendarPrincipalResource
 from twistedcaldav.static import AutoProvisioningFileMixIn
 from twistedcaldav.directory.idirectory import IDirectoryService
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 # Use __underbars__ convention to avoid conflicts with directory resource types.
 uidsResourceName = "__uids__"
 

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/dropbox.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/dropbox.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -30,7 +30,6 @@
 import time
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
 from twisted.web2.dav.http import HTTPError, ErrorResponse, StatusResponse
@@ -40,7 +39,10 @@
 from twistedcaldav import customxml
 from twistedcaldav.config import config
 from twistedcaldav.customxml import calendarserver_namespace
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 class DropBoxHomeResource (DAVResource):
     """
     Drop box collection resource.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/extensions.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/extensions.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -33,7 +33,6 @@
 import cgi
 import time
 
-from twisted.python import log
 from twisted.internet.defer import succeed, deferredGenerator, waitForDeferred
 from twisted.web2 import responsecode
 from twisted.web2.http import HTTPError, Response, RedirectResponse
@@ -47,9 +46,13 @@
 from twisted.web2.dav.resource import DAVResource as SuperDAVResource
 from twisted.web2.dav.resource import DAVPrincipalResource as SuperDAVPrincipalResource
 from twisted.web2.dav.util import joinURL
+
 from twistedcaldav.directory.sudo import SudoDirectoryService
 from twistedcaldav.directory.directory import DirectoryService
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 class SudoSACLMixin(object):
     """
     Mixin class to let DAVResource, and DAVFile subclasses below know

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/ical.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/ical.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/ical.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -40,13 +40,15 @@
 from vobject.icalendar import stringToDate, stringToDateTime, stringToDurations
 from vobject.icalendar import utc
 
-from twisted.python import log
 from twisted.web2.stream import IStream
 from twisted.web2.dav.util import allDataFromStream
 
 from twistedcaldav.dateops import compareDateTime, normalizeToUTC, timeRangesOverlap
 from twistedcaldav.instance import InstanceList
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 iCalendarProductID = "-//CALENDARSERVER.ORG//NONSGML Version 1//EN"
 
 allowedComponents = (

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/index.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/index.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/index.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -35,15 +35,16 @@
 except ImportError:
     from pysqlite2 import dbapi2 as sqlite
 
-from twisted.python import log
+from vobject.icalendar import utc
 
 from twistedcaldav.ical import Component
 from twistedcaldav.query import calendarquery
 from twistedcaldav.sql import AbstractSQLDatabase
 from twistedcaldav.sql import db_prefix
 from twistedcaldav import caldavxml
+from twistedcaldav.log import Logger
 
-from vobject.icalendar import utc
+log = Logger()
 
 db_basename = db_prefix + "sqlite"
 schema_version = "6"

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/logging.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/logging.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/logging.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -22,7 +22,6 @@
 import os
 import time
 
-from twisted.python import log
 from twisted.internet import protocol
 
 from twisted.web2 import iweb
@@ -32,7 +31,10 @@
 
 from twistedcaldav.config import config
 from twistedcaldav.directory.directory import DirectoryService
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 #
 # Logging levels:
 #  0 - no logging

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/copymove.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/copymove.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/copymove.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -23,7 +23,6 @@
 from urlparse import urlsplit
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.filter.location import addLocation
 from twisted.web2.dav import davxml
@@ -34,7 +33,10 @@
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.method.put_common import storeCalendarObjectResource
 from twistedcaldav.resource import isCalendarCollectionResource
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 def http_COPY(self, request):
     """
     Special handling of COPY request if parents are calendar collections.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/mkcalendar.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/mkcalendar.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/mkcalendar.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -21,7 +21,6 @@
 __all__ = ["http_MKCALENDAR"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
@@ -31,7 +30,10 @@
 from twisted.web2.http import HTTPError, StatusResponse
 
 from twistedcaldav import caldavxml
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 def http_MKCALENDAR(self, request):
     """
     Respond to a MKCALENDAR request.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/propfind.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/propfind.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/propfind.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -27,7 +27,6 @@
 
 __all__ = ["http_PROPFIND"]
 
-from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 from twisted.web2.http import HTTPError
@@ -37,6 +36,10 @@
 from twisted.web2.dav.http import MultiStatusResponse, statusForFailure
 from twisted.web2.dav.util import normalizeURL, davXMLFromStream
 
+from twistedcaldav.log import Logger
+
+log = Logger()
+
 """
 This is a direct copy of the twisted implementation of PROPFIND except that it uses the
 findChildrenFaster method to optimize child privilege checking.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -21,7 +21,6 @@
 __all__ = ["http_PUT"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.dav.http import ErrorResponse
 from twisted.web2.dav.util import allDataFromStream, parentForURL
@@ -30,7 +29,10 @@
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.method.put_common import storeCalendarObjectResource
 from twistedcaldav.resource import isPseudoCalendarCollectionResource
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 def http_PUT(self, request):
 
     parentURL = parentForURL(request.uri)

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put_common.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/put_common.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -25,7 +25,7 @@
 from twisted.internet.defer import deferredGenerator
 from twisted.internet.defer import maybeDeferred
 from twisted.internet.defer import waitForDeferred
-from twisted.python import failure, log
+from twisted.python import failure
 from twisted.python.filepath import FilePath
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
@@ -54,7 +54,10 @@
 from twistedcaldav.ical import Component, Property
 from twistedcaldav.index import ReservationError
 from twistedcaldav.instance import TooManyInstancesError
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 @deferredGenerator
 def storeCalendarObjectResource(
     request,

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -29,7 +29,6 @@
 
 import string
 
-from twisted.python import log
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 from twisted.web2 import responsecode
 from twisted.web2.http import HTTPError, StatusResponse
@@ -39,7 +38,10 @@
 from twisted.web2.dav.util import davXMLFromStream
 
 from twistedcaldav import caldavxml
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 max_number_of_matches = 500
 
 class NumberOfMatchesWithinLimits(Exception):

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_calquery.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_calquery.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_calquery.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -20,8 +20,9 @@
 
 __all__ = ["report_urn_ietf_params_xml_ns_caldav_calendar_query"]
 
+import urllib
+
 from twisted.internet.defer import deferredGenerator, succeed, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
 from twisted.web2.dav.element.base import dav_namespace
@@ -33,8 +34,9 @@
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.customxml import TwistedCalendarAccessProperty
 from twistedcaldav.method import report_common
+from twistedcaldav.log import Logger
 
-import urllib
+log = Logger()
 
 max_number_of_results = 1000
 

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_common.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_common.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -26,8 +26,13 @@
     "buildFreeBusyResult",
 ]
 
+import datetime
+import md5
+import time
+
+from vobject.icalendar import utc
+
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
@@ -45,13 +50,10 @@
 from twistedcaldav.dateops import clipPeriod, normalizePeriodList, timeRangesOverlap
 from twistedcaldav.ical import Component, Property, iCalendarProductID
 from twistedcaldav.instance import InstanceList
+from twistedcaldav.log import Logger
 
-from vobject.icalendar import utc
+log = Logger()
 
-import datetime
-import md5
-import time
-
 def applyToCalendarCollections(resource, request, request_uri, depth, apply, privileges):
     """
     Run an operation on all calendar collections, starting at the specified

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_freebusy.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_freebusy.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -21,7 +21,6 @@
 __all__ = ["report_urn_ietf_params_xml_ns_caldav_free_busy_query"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.dav.element.base import dav_namespace
 from twisted.web2.dav.http import ErrorResponse
@@ -32,7 +31,10 @@
 
 from twistedcaldav import caldavxml
 from twistedcaldav.method import report_common
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 def report_urn_ietf_params_xml_ns_caldav_free_busy_query(self, request, freebusy): #@UnusedVariable
     """
     Generate a free-busy REPORT.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_multiget.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_multiget.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/method/report_multiget.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -20,8 +20,9 @@
 
 __all__ = ["report_urn_ietf_params_xml_ns_caldav_calendar_multiget"]
 
+from urllib import unquote
+
 from twisted.internet.defer import deferredGenerator, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
 from twisted.web2.dav.element.base import dav_namespace
@@ -32,8 +33,9 @@
 
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.method import report_common
+from twistedcaldav.log import Logger
 
-from urllib import unquote
+log = Logger()
 
 max_number_of_multigets = 5000
 

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/root.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/root.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/root.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -15,7 +15,6 @@
 ##
 
 from twisted.internet import defer
-from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.cred.error import LoginFailed, UnauthorizedLogin
 
@@ -26,7 +25,10 @@
 
 from twistedcaldav.extensions import DAVFile
 from twistedcaldav.config import config
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 class RootResource(DAVFile):
     """
     A special root resource that contains support checking SACLs

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/sql.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/sql.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/sql.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -29,8 +29,10 @@
 except ImportError:
     from pysqlite2 import dbapi2 as sqlite
 
-from twisted.python import log
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 db_prefix = ".db."
 
 class AbstractSQLDatabase(object):

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/static.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/static.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -40,7 +40,6 @@
 from urlparse import urlsplit
 
 from twisted.internet.defer import deferredGenerator, fail, succeed, waitForDeferred
-from twisted.python import log
 from twisted.web2 import responsecode
 from twisted.web2.http import HTTPError, StatusResponse
 from twisted.web2.dav import davxml
@@ -70,7 +69,10 @@
 from twistedcaldav.directory.calendar import DirectoryCalendarHomeUIDProvisioningResource
 from twistedcaldav.directory.calendar import DirectoryCalendarHomeResource
 from twistedcaldav.directory.resource import AutoProvisioningResourceMixIn
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 class CalDAVFile (CalDAVResource, DAVFile):
     """
     CalDAV-accessible L{DAVFile} resource.

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/tap.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/tap.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/tap.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -19,7 +19,7 @@
 
 from zope.interface import implements
 
-from twisted.python import log
+from twisted.python.log import FileLogObserver
 from twisted.python.usage import Options, UsageError
 from twisted.python.reflect import namedClass
 
@@ -52,6 +52,10 @@
 from twistedcaldav.static import CalendarHomeProvisioningFile
 from twistedcaldav.timezones import TimezoneCache
 
+from twistedcaldav.log import Logger
+
+log = Logger()
+
 try:
     from twistedcaldav.authkerb import NegotiateCredentialFactory
 except ImportError:
@@ -236,7 +240,7 @@
         #
 
         if not config.ErrorLogFile and config.ProcessType == "Slave":
-            log.FileLogObserver.timeFormat = ""
+            FileLogObserver.timeFormat = ""
 
         # Check current umask and warn if changed
         oldmask = os.umask(config.umask)

Modified: CalendarServer/branches/users/wsanchez/logging/twistedcaldav/timezones.py
===================================================================
--- CalendarServer/branches/users/wsanchez/logging/twistedcaldav/timezones.py	2008-04-16 19:19:33 UTC (rev 2319)
+++ CalendarServer/branches/users/wsanchez/logging/twistedcaldav/timezones.py	2008-04-16 19:21:39 UTC (rev 2320)
@@ -16,16 +16,17 @@
 # DRI: Cyrus Daboo, cdaboo at apple.com
 ##
 
-from twistedcaldav.ical import Component
+import os
 
-from twisted.python import log
-
+import vobject
 from vobject.icalendar import getTzid
 from vobject.icalendar import registerTzid
 
-import os
-import vobject
+from twistedcaldav.ical import Component
+from twistedcaldav.log import Logger
 
+log = Logger()
+
 """
 Timezone caching.
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080416/b366a7a7/attachment-0001.html


More information about the calendarserver-changes mailing list