[CalendarServer-changes] [4255] CalendarServer/trunk/conf

source_changes at macosforge.org source_changes at macosforge.org
Wed May 13 17:07:35 PDT 2009


Revision: 4255
          http://trac.macosforge.org/projects/calendarserver/changeset/4255
Author:   wsanchez at apple.com
Date:     2009-05-13 17:07:35 -0700 (Wed, 13 May 2009)
Log Message:
-----------
Don't expose GlobalStats hooey outside of test config

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2009-05-13 23:43:07 UTC (rev 4254)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2009-05-14 00:07:35 UTC (rev 4255)
@@ -270,27 +270,10 @@
     <key>DefaultLogLevel</key>
     <string>warn</string> <!-- debug, info, warn, error -->
 
-	<!-- Global server stats --> 
-	<key>GlobalStatsSocket</key> 
-	<string>/var/run/caldavd-stats.sock</string> 
+    <!-- Global server stats --> 
+    <key>GlobalStatsSocket</key> 
+    <string>/var/run/caldavd-stats.sock</string> 
 
-	<!-- 
-		To log every five minutes and keep stats for the last hour: 
-
-			GlobalStatsLoggingPeriod : 60 
-			GlobalStatsLoggingFrequency : 12 
-
-		Set GlobalStatsLoggingFrequency to 0 to disable the stats 
-	--> 
-
-	<!-- Global server stats logging period --> 
-	<key>GlobalStatsLoggingPeriod</key> 
-	<integer>60</integer> 
-
-	<!-- Global server stats logging frequency --> 
- 	<key>GlobalStatsLoggingFrequency</key> 
-	<integer>12</integer> 
-
     <!-- Server statistics file -->
     <key>ServerStatsFile</key>
     <string>/var/run/caldavd/stats.plist</string>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2009-05-13 23:43:07 UTC (rev 4254)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2009-05-14 00:07:35 UTC (rev 4255)
@@ -341,27 +341,18 @@
       -->
     </dict>
 
-	<!-- Global server stats --> 
-	<key>GlobalStatsSocket</key> 
-	<string>logs/caldavd-stats.sock</string> 
+    <!-- Global server stats --> 
+    <key>GlobalStatsSocket</key> 
+    <string>/var/run/caldavd-stats.sock</string> 
 
-	<!-- 
-		To log every five minutes and keep stats for the last hour: 
+    <!-- Global server stats logging period --> 
+    <key>GlobalStatsLoggingPeriod</key> 
+    <integer>60</integer> 
 
-			GlobalStatsLoggingPeriod : 60 
-			GlobalStatsLoggingFrequency : 12 
+    <!-- Global server stats logging frequency [0 = disable stats] --> 
+    <key>GlobalStatsLoggingFrequency</key> 
+    <integer>12</integer>
 
-		Set GlobalStatsLoggingFrequency to 0 to disable the stats 
-	--> 
-
-	<!-- Global server stats logging period --> 
-	<key>GlobalStatsLoggingPeriod</key> 
-	<integer>1</integer> 
-
-	<!-- Global server stats logging frequency --> 
- 	<key>GlobalStatsLoggingFrequency</key> 
-	<integer>1</integer> 
-
     <!-- Server statistics file -->
     <key>ServerStatsFile</key>
     <string>logs/stats.plist</string>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2009-05-13 23:43:07 UTC (rev 4254)
+++ CalendarServer/trunk/conf/caldavd.plist	2009-05-14 00:07:35 UTC (rev 4255)
@@ -262,27 +262,10 @@
     <key>DefaultLogLevel</key>
     <string>warn</string> <!-- debug, info, warn, error -->
 
-	<!-- Global server stats --> 
-	<key>GlobalStatsSocket</key> 
-	<string>/var/run/caldavd-stats.sock</string> 
+    <!-- Global server stats --> 
+    <key>GlobalStatsSocket</key> 
+    <string>/var/run/caldavd-stats.sock</string> 
 
-	<!-- 
-		To log every five minutes and keep stats for the last hour: 
-
-			GlobalStatsLoggingPeriod : 60 
-			GlobalStatsLoggingFrequency : 12 
-
-		Set GlobalStatsLoggingFrequency to 0 to disable the stats 
-	--> 
-
-	<!-- Global server stats logging period --> 
-	<key>GlobalStatsLoggingPeriod</key> 
-	<integer>60</integer> 
-
-	<!-- Global server stats logging frequency --> 
- 	<key>GlobalStatsLoggingFrequency</key> 
-	<integer>12</integer> 
-
     <!-- Server statistics file -->
     <key>ServerStatsFile</key>
     <string>/var/run/caldavd/stats.plist</string>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090513/e8b0b2e9/attachment.html>


More information about the calendarserver-changes mailing list