[CalendarServer-changes] [864] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 864
          http://trac.macosforge.org/projects/calendarserver/changeset/864
Author:   wsanchez at apple.com
Date:     2006-12-19 18:26:46 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
Use logs dir for ./run.

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

Property Changed:
----------------
    CalendarServer/trunk/


Property changes on: CalendarServer/trunk
___________________________________________________________________
Name: svn:ignore
   - *.tgz
server.log*
error.log*
caldavd.pid

   + *.tgz
logs
build


Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2006-12-20 01:04:20 UTC (rev 863)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2006-12-20 02:26:46 UTC (rev 864)
@@ -48,16 +48,16 @@
   <string>conf/server.pem</string>
 
   <key>ServerLogFile</key>
-  <string>server.log</string>
+  <string>logs/server.log</string>
 
   <key>ErrorLogFile</key>
   <string>-</string>
 
   <key>ServerStatsFile</key>
-  <string>stats.plist</string>
+  <string>logs/stats.plist</string>
 
   <key>PIDFile</key>
-  <string>caldavd.pid</string>
+  <string>logs/caldavd.pid</string>
 
   <!--  XML File Directory Service -->
   <key>DirectoryService</key>

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2006-12-20 01:04:20 UTC (rev 863)
+++ CalendarServer/trunk/run	2006-12-20 02:26:46 UTC (rev 864)
@@ -172,13 +172,16 @@
 
   if ! "${setup_only}"; then
     if [ ! -f "${config}" ]; then
-        echo "Missing config file: ${config}";
-        echo "You might want to start by copying the test configuration:";
-        echo "  cp conf/caldavd-test.plist conf/caldavd-dev.plist";
-        exit 1;
+      echo "Missing config file: ${config}";
+      echo "You might want to start by copying the test configuration:";
+      echo "  cp conf/caldavd-test.plist conf/caldavd-dev.plist";
+      exit 1;
     fi;
 
     cd "${wd}";
+    if [ ! -d "${wd}/logs" ]; then
+      mkdir "${wd}/logs";
+    fi;
     exec /bin/sh "${caldav}/bin/caldavd" ${daemonize} \
         -f "${config}"                                \
         -T "${twisted}/bin/twistd"                    \

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