subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1299319 - in /subversion/trunk/tools/server-side/svnpubsub: daemonize.py svnwcsub.py
Date Sun, 11 Mar 2012 01:22:34 GMT
Author: joes
Date: Sun Mar 11 01:22:34 2012
New Revision: 1299319

URL: http://svn.apache.org/viewvc?rev=1299319&view=rev
Log:
* trunk/tools/server-side/svnpubsub svnwcsub.py daemonize.py
 need to reinstall default sighandlers in the second child (the actual daemon process)

Modified:
    subversion/trunk/tools/server-side/svnpubsub/daemonize.py
    subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py

Modified: subversion/trunk/tools/server-side/svnpubsub/daemonize.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/daemonize.py?rev=1299319&r1=1299318&r2=1299319&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/daemonize.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/daemonize.py Sun Mar 11 01:22:34 2012
@@ -151,6 +151,9 @@ class Daemon(object):
       raise ChildResumedIncorrectly()
 
     # we're a deamon now. get rid of the final remnants of the parent.
+    # start by restoring default signal handlers
+    signal.signal(signal.SIGUSR1, signal.SIG_DFL)
+    signal.signal(signal.SIGCHLD, signal.SIG_DFL)
     sys.stdout.flush()
     sys.stderr.flush()
     si = open('/dev/null', 'r')

Modified: subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py?rev=1299319&r1=1299318&r2=1299319&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py Sun Mar 11 01:22:34 2012
@@ -29,7 +29,6 @@
 # See svnwcsub.conf for more information on its contents.
 #
 
-import signal
 import subprocess
 import threading
 import sys
@@ -140,7 +139,6 @@ class BigDoEverythingClasss(object):
             self.hostports.append((parsed.hostname, parsed.port))
 
     def start(self):
-        signal.signal(signal.SIGCHLD, signal.SIG_DFL)
         for path, url in self.tracking.items():
             # working copies auto-register with the BDEC when they are ready.
             WorkingCopy(self, path, url)



Mime
View raw message