[CalendarServer-changes] [5266] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5266
          http://trac.macosforge.org/projects/calendarserver/changeset/5266
Author:   dre at apple.com
Date:     2010-03-08 09:42:40 -0800 (Mon, 08 Mar 2010)
Log Message:
-----------
Make stats socket read-only, added documentation for '-a' to 'run' script cli help

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-03-06 20:03:21 UTC (rev 5265)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-03-08 17:42:40 UTC (rev 5266)
@@ -881,7 +881,7 @@
 
         stats = CalDAVStatisticsServer(logger) 
         statsService = GroupOwnedUNIXServer(
-            gid, config.GlobalStatsSocket, stats, mode=0660
+            gid, config.GlobalStatsSocket, stats, mode=0440
         )
         statsService.setName("stats")
         statsService.setServiceParent(s)

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2010-03-06 20:03:21 UTC (rev 5265)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2010-03-08 17:42:40 UTC (rev 5266)
@@ -340,7 +340,7 @@
         self.config["ProcessType"] = "Combined"
         self.writeConfig()
         svc = self.makeService()
-        for serviceName in ["logging", "stats"]:
+        for serviceName in ["logging"]:
             socketService = svc.getServiceNamed(serviceName)
             self.assertIsInstance(socketService, GroupOwnedUNIXServer)
             m = socketService.kwargs.get("mode", 0666)
@@ -349,9 +349,19 @@
                 "Wrong mode on %s: %s" % (serviceName, oct(m))
             )
             self.assertEquals(socketService.gid, alternateGroup)
+        for serviceName in ["stats"]:
+            socketService = svc.getServiceNamed(serviceName)
+            self.assertIsInstance(socketService, GroupOwnedUNIXServer)
+            m = socketService.kwargs.get("mode", 0444)
+            self.assertEquals(
+                m, int("440", 8),
+                "Wrong mode on %s: %s" % (serviceName, oct(m))
+            )
+            self.assertEquals(socketService.gid, alternateGroup)
 
 
 
+
 class SlaveServiceTest(BaseServiceMakerTests):
     """
     Test various configurations of the Slave service

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2010-03-06 20:03:21 UTC (rev 5265)
+++ CalendarServer/trunk/run	2010-03-08 17:42:40 UTC (rev 5266)
@@ -67,6 +67,7 @@
   echo "	-S  Write a pstats object for each process to the given directory when the server is stopped.";
   echo "	-P  Select the twistd plugin name [${plugin_name}]";
   echo "	-R  Twisted Reactor plugin to execute [${reactor}]";
+  echo "	-a  Start in CardDAV mode";
 
   if [ "${1-}" == "-" ]; then
     return 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100308/e875e355/attachment.html>