[Zodb-checkins] CVS: Zope/lib/python/zdaemon - Daemon.py:1.11.4.3 ZDaemonLogging.py:1.4.4.1

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Daemon.py ZDaemonLogging.py 
Log Message:
Merge changes from trunk.


=== Zope/lib/python/zdaemon/Daemon.py 1.11.4.2 => 1.11.4.3 ===
--- Zope/lib/python/zdaemon/Daemon.py:1.11.4.2	Tue Oct  8 17:45:57 2002
+++ Zope/lib/python/zdaemon/Daemon.py	Wed Oct  9 00:57:33 2002
@@ -55,7 +55,7 @@
                 # ie. HUP, INT, QUIT, USR1, USR2, TERM
                 for sig in interesting:
                     signal.signal(sig, SignalPasser(pid))
-                pstamp('Houston, we have forked: pid %s' % pid, zLOG.INFO)
+                pstamp('Started subprocess: pid %s' % pid, zLOG.INFO)
                 write_pidfile(pidfile)
                 p,s = wait(pid) # waitpid will block until child exit
                 if s:
@@ -113,8 +113,7 @@
     elif os.WIFSIGNALED(s):
         signum = os.WTERMSIG(s)
         signame = get_signal_name(signum)
-        msg = "terminated by signal %s(%s)" % (signame,
-                                              signum)
+        msg = "terminated by signal %s(%s)" % (signame, signum)
         # We'd like to report whether a core file
         # was produced, but there isn't a standard
         # way to check.  It seems that some
@@ -131,9 +130,8 @@
         # XXX what should we do here?
         signum = os.WSTOPSIG(s)
         signame = get_signal_name(signum)
-        msg = "stopped by signal %s(%s)" % (signame,
-                                            signum)
-    pstamp('Aieeee!  Process %s %s' % (p, msg), zLOG.ERROR)
+        msg = "stopped by signal %s(%s)" % (signame, signum)
+    pstamp('Process %s %s' % (p, msg), zLOG.ERROR)
 
 _signals = None
 


=== Zope/lib/python/zdaemon/ZDaemonLogging.py 1.4 => 1.4.4.1 ===
--- Zope/lib/python/zdaemon/ZDaemonLogging.py:1.4	Wed Aug 14 18:12:52 2002
+++ Zope/lib/python/zdaemon/ZDaemonLogging.py	Wed Oct  9 00:57:33 2002
@@ -17,5 +17,4 @@
 from zLOG import LOG
 
 def pstamp(message, sev):
-    LOG("zdaemon", sev,
-        ("zdaemon: %s: %s" % (ctime(time()), message)))
+    LOG("zdaemon", sev, message)