[CalendarServer-changes] [1244] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1244
          http://trac.macosforge.org/projects/calendarserver/changeset/1244
Author:   wsanchez at apple.com
Date:     2007-02-22 19:02:03 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
ServerLogFile -> AccessLogFile

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test-logged.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/admin/options.py
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 02:59:23 UTC (rev 1243)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 03:02:03 UTC (rev 1244)
@@ -55,7 +55,7 @@
   <key>SSLCertificate</key>
   <string>conf/server.pem</string>
 
-  <key>ServerLogFile</key>
+  <key>AccessLogFile</key>
   <string>logs/server.log</string>
 
   <key>ErrorLogFile</key>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 02:59:23 UTC (rev 1243)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 03:02:03 UTC (rev 1244)
@@ -61,7 +61,7 @@
   <key>SSLCertificate</key>
   <string>conf/server.pem</string>
 
-  <key>ServerLogFile</key>
+  <key>AccessLogFile</key>
   <string>logs/server.log</string>
 
   <key>ErrorLogFile</key>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-23 02:59:23 UTC (rev 1243)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-23 03:02:03 UTC (rev 1244)
@@ -60,7 +60,7 @@
   <key>SSLCertificate</key>
   <string>/etc/certificates/Default.crt</string>
 
-  <key>ServerLogFile</key>
+  <key>AccessLogFile</key>
   <string>/var/log/caldavd/server.log</string>
 
   <key>ServerStatsFile</key>

Modified: CalendarServer/trunk/twistedcaldav/admin/options.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/options.py	2007-02-23 02:59:23 UTC (rev 1243)
+++ CalendarServer/trunk/twistedcaldav/admin/options.py	2007-02-23 03:02:03 UTC (rev 1244)
@@ -127,7 +127,7 @@
     def postOptions(self):
         if not self['logfile']:
             self['logfile'] = filepath.FilePath(
-                config.ServerLogFile)
+                config.AccessLogFile)
         else:
             self['logfile'] = filepath.FilePath(self['logfile'])
 

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 02:59:23 UTC (rev 1243)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 03:02:03 UTC (rev 1244)
@@ -85,7 +85,7 @@
     # Logging
     #
     "Verbose": False,
-    "ServerLogFile": "/var/log/caldavd/access.log",                     # Apache-styp access log
+    "AccessLogFile": "/var/log/caldavd/access.log",                     # Apache-style access log
     "ErrorLogFile": "/var/log/caldavd/error.log",                       # Server activity log
     "ServerStatsFile": "/Library/CalendarServer/Documents/stats.plist",
     "PIDFile": "/var/run/caldavd.pid",

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2007-02-23 02:59:23 UTC (rev 1243)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2007-02-23 03:02:03 UTC (rev 1244)
@@ -420,9 +420,9 @@
         channel = http.HTTPFactory(site)
 
         log.msg("Configuring rotating log observer for file: %s" % (
-            config.ServerLogFile,))
+            config.AccessLogFile,))
 
-        logObserver = RotatingFileAccessLoggingObserver(config.ServerLogFile)
+        logObserver = RotatingFileAccessLoggingObserver(config.AccessLogFile)
         
         service = CalDAVService(logObserver)
 

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