[CalendarServer-changes] [11041] CalendarServer/trunk/calendarserver/tap/util.py

[source_changes at macosforge.org]

Revision: 11041
          http://trac.calendarserver.org//changeset/11041
Author:   sagen at apple.com
Date:     2013-04-16 08:37:46 -0700 (Tue, 16 Apr 2013)
Log Message:
-----------
Always create RunRoot and LogRoot, not just when they are beneath ServerRoot (for example /var/run gets blown away upon reboot)

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2013-04-15 20:55:19 UTC (rev 11040)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2013-04-16 15:37:46 UTC (rev 11041)
@@ -974,17 +974,16 @@
             access=os.W_OK,
             create=(0750, config.UserName, config.GroupName),
         )
-    if config.LogRoot.startswith(config.ServerRoot + os.sep):
-        checkDirectory(
-            config.LogRoot,
-            "Log root",
-            access=os.W_OK,
-            create=(0750, config.UserName, config.GroupName),
-        )
-    if config.RunRoot.startswith(config.ServerRoot + os.sep):
-        checkDirectory(
-            config.RunRoot,
-            "Run root",
-            access=os.W_OK,
-            create=(0770, config.UserName, config.GroupName),
-        )
+    # Always create  these:
+    checkDirectory(
+        config.LogRoot,
+        "Log root",
+        access=os.W_OK,
+        create=(0750, config.UserName, config.GroupName),
+    )
+    checkDirectory(
+        config.RunRoot,
+        "Run root",
+        access=os.W_OK,
+        create=(0770, config.UserName, config.GroupName),
+    )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130416/96813ffb/attachment-0001.html>