[CalendarServer-changes] [1182] CalendarServer/branches/users/tfitz/log-alot-128-2

[source_changes at macosforge.org]

Revision: 1182
          http://trac.macosforge.org/projects/calendarserver/changeset/1182
Author:   tfitz at apple.com
Date:     2007-02-13 13:27:53 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Reverting hack.

Modified Paths:
--------------
    CalendarServer/branches/users/tfitz/log-alot-128-2/lib-patches/Twisted/twisted.scripts._twistd_unix.patch
    CalendarServer/branches/users/tfitz/log-alot-128-2/run

Modified: CalendarServer/branches/users/tfitz/log-alot-128-2/lib-patches/Twisted/twisted.scripts._twistd_unix.patch
===================================================================
--- CalendarServer/branches/users/tfitz/log-alot-128-2/lib-patches/Twisted/twisted.scripts._twistd_unix.patch	2007-02-13 21:21:20 UTC (rev 1181)
+++ CalendarServer/branches/users/tfitz/log-alot-128-2/lib-patches/Twisted/twisted.scripts._twistd_unix.patch	2007-02-13 21:27:53 UTC (rev 1182)
@@ -1,25 +0,0 @@
-Index: twisted/scripts/_twistd_unix.py
-===================================================================
---- twisted/scripts/_twistd_unix.py	(revision 19636)
-+++ twisted/scripts/_twistd_unix.py	(working copy)
-@@ -9,7 +9,7 @@
- from twisted.scripts import mktap
- from twisted import copyright
- 
--import os, errno, sys
-+import os, errno, sys, time
- 
- class ServerOptions(app.ServerOptions):
-     synopsis = "Usage: twistd [options]"
-@@ -129,9 +129,11 @@
- def daemonize():
-     # See http://www.erlenstar.demon.co.uk/unix/faq_toc.html#TOC16
-     if os.fork():   # launch child and...
-+        time.sleep(2)
-         os._exit(0) # kill off parent
-     os.setsid()
-     if os.fork():   # launch child and...
-+        time.sleep(2)    
-         os._exit(0) # kill off parent again.
-     os.umask(077)
-     null=os.open('/dev/null', os.O_RDWR)

Modified: CalendarServer/branches/users/tfitz/log-alot-128-2/run
===================================================================
--- CalendarServer/branches/users/tfitz/log-alot-128-2/run	2007-02-13 21:21:20 UTC (rev 1181)
+++ CalendarServer/branches/users/tfitz/log-alot-128-2/run	2007-02-13 21:27:53 UTC (rev 1182)
@@ -185,7 +185,7 @@
     if [ ! -d "${wd}/logs" ]; then
       mkdir "${wd}/logs";
     fi;
-    exec ktrace -d -i /bin/sh "${caldav}/bin/caldavd" ${daemonize} \
+    exec /bin/sh "${caldav}/bin/caldavd" ${daemonize} \
         -f "${config}"                                \
         -T "${twisted}/bin/twistd"                    \
         -P "${plugin_name}"                           \

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