[Zodb-checkins] CVS: Zope/lib/python/zdaemon - Daemon.py:1.11 Heartbeat.py:1.4 SignalHandler.py:1.2 SignalPasser.py:1.4 ZDaemonLogging.py:1.4 __init__.py:1.4

Martijn Pieters mj@zope.com
Wed, 14 Aug 2002 18:12:53 -0400


Update of /cvs-repository/Zope/lib/python/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv21614

Modified Files:
	Daemon.py Heartbeat.py SignalHandler.py SignalPasser.py 
	ZDaemonLogging.py __init__.py 
Log Message:
Clean up indentation and trailing whitespace.


=== Zope/lib/python/zdaemon/Daemon.py 1.10 => 1.11 ===
--- Zope/lib/python/zdaemon/Daemon.py:1.10	Sat Jun 15 00:19:23 2002
+++ Zope/lib/python/zdaemon/Daemon.py	Wed Aug 14 18:12:52 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 import os, sys, time, signal
@@ -31,7 +31,7 @@
 
     if not os.environ.has_key('Z_DEBUG_MODE'):
         detach() # detach from the controlling terminal
-    
+
     while 1:
         try:
             pid = os.fork()
@@ -68,7 +68,7 @@
             sys.exit()
 
 def detach():
-    # do the funky chicken dance to detach from the terminal 
+    # do the funky chicken dance to detach from the terminal
     pid = os.fork()
     if pid: sys.exit(0)
     os.close(0); sys.stdin  = open('/dev/null')


=== Zope/lib/python/zdaemon/Heartbeat.py 1.3 => 1.4 ===
--- Zope/lib/python/zdaemon/Heartbeat.py:1.3	Mon Feb 11 18:40:44 2002
+++ Zope/lib/python/zdaemon/Heartbeat.py	Wed Aug 14 18:12:52 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 '''Heartbeat feature for process management daemon.
 '''
@@ -30,7 +30,7 @@
 # activities = (("http://x/method", "username", "password"),)
 #
 # username and password may be None if the method does not require
-# authentication. 
+# authentication.
 
 # activities = (('http://localhost:9222/Heart/heart', 'michel', '123'),
 #               )
@@ -49,4 +49,3 @@
             if result and VERBOSE:
                 pstamp('activity %s returned: %s' % (a[0], result),
                        zLOG.BLATHER)
-


=== Zope/lib/python/zdaemon/SignalHandler.py 1.1 => 1.2 ===
--- Zope/lib/python/zdaemon/SignalHandler.py:1.1	Tue Aug  6 11:37:56 2002
+++ Zope/lib/python/zdaemon/SignalHandler.py	Wed Aug 14 18:12:52 2002
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 """Signal handling dispatcher."""
@@ -66,5 +66,3 @@
 
 # The SignalHandler is actually a singleton.
 SignalHandler = SignalHandler()
-
-


=== Zope/lib/python/zdaemon/SignalPasser.py 1.3 => 1.4 ===
--- Zope/lib/python/zdaemon/SignalPasser.py:1.3	Sat Jun 15 00:16:49 2002
+++ Zope/lib/python/zdaemon/SignalPasser.py	Wed Aug 14 18:12:52 2002
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 """ A module used for passing signals to children """
@@ -25,4 +25,3 @@
         # we want to die ourselves if we're signaled with SIGTERM or SIGINT
         if signum in [signal.SIGTERM, signal.SIGINT]:
             sys.exit(0)
-


=== Zope/lib/python/zdaemon/ZDaemonLogging.py 1.3 => 1.4 ===
--- Zope/lib/python/zdaemon/ZDaemonLogging.py:1.3	Mon Feb 11 18:40:44 2002
+++ Zope/lib/python/zdaemon/ZDaemonLogging.py	Wed Aug 14 18:12:52 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 from time import time, ctime


=== Zope/lib/python/zdaemon/__init__.py 1.3 => 1.4 ===
--- Zope/lib/python/zdaemon/__init__.py:1.3	Mon Feb 11 18:40:44 2002
+++ Zope/lib/python/zdaemon/__init__.py	Wed Aug 14 18:12:52 2002
@@ -3,14 +3,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """
 
@@ -51,7 +51,7 @@
         print __doc__ % vars()
         print
         print 'Error: no script given'
-            
+
     run(argv, pidf)
 
 if __name__ == '__main__': main()