Changeset 1514

Timestamp:

06/02/04 23:51:14 (20 years ago)

Author:

jalet

Message:

Moved the sigterm capturing elsewhere

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (4 diffs)
• pykota/accounters/software.py (modified) (2 diffs)
• pykota/tool.py (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.56  2004/06/02 21:50:56  jalet
+# Moved the sigterm capturing elsewhere
+#
 # Revision 1.55  2004/06/02 14:25:07  jalet
 # Should correctly capture ALL errors now
@@ -463 +466 @@
             endinput = 1
         
-        self.logdebug("Capturing SIGTERM events.")
-        signal.signal(signal.SIGTERM, self.sigterm_handler)
-        
         self.logdebug("Entering streams polling loop...")
         MEGABYTE = 1024*1024
@@ -480 +480 @@
                     os.kill(subprocess.pid, signal.SIGTERM)
                 except OSError, msg : # ignore but logs if process was already killed.
-                    self.logdebug("Error while sending signal to pid %s" % subprocess.pid)
+                    self.logdebug("Error while sending signal to pid %s : %s" % (subprocess.pid, msg))
                 else :    
                     self.logger.log_message(_("SIGTERM was sent to real backend %s (pid: %s)") % (realbackend, subprocess.pid), "info")
@@ -591 +591 @@
         self.logdebug("Exiting streams polling loop...")
         
-        self.logdebug("Ignoring SIGTERM again.")
-        signal.signal(signal.SIGTERM, signal.SIG_IGN)
-            
         # Check exit code of original CUPS backend.    
         if status == -1 :

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.4  2004/06/02 21:51:14  jalet
+# Moved the sigterm capturing elsewhere
+#
 # Revision 1.3  2004/05/24 22:45:49  jalet
 # New 'enforcement' directive added
@@ -71 +74 @@
             retcode = child.wait()
         except OSError, msg :    
-            self.filter.logger.log_message(_("Problem while waiting for software accounter pid %s to exit") % child.pid)
+            self.filter.logger.log_message(_("Problem while waiting for software accounter pid %s to exit : %s") % (child.pid, msg))
         else :    
             if os.WIFEXITED(retcode) :

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.93  2004/06/02 21:51:02  jalet
+# Moved the sigterm capturing elsewhere
+#
 # Revision 1.92  2004/06/02 13:21:38  jalet
 # Debug message added
@@ -810 +813 @@
         self.exportJobInfo()
         self.jobdatastream = self.openJobDataStream()
+        self.logdebug("Capturing SIGTERM events.")
+        signal.signal(signal.SIGTERM, self.sigterm_handler)
         
     def openJobDataStream(self) :