Changeset 2624

Timestamp:

01/16/06 23:27:07 (18 years ago)

Author:

jerome

Message:

Now cupspykota can be interrupted cleanly with SIGINT.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (4 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -59 +59 @@
         PyKotaTool.deferredInit(self)
         self.gotSigTerm = 0
+        self.disableSigInt()
         self.installSigTermHandler()
         
@@ -78 +79 @@
         signal.signal(signal.SIGTERM, self.sigtermHandler)
         self.logdebug("SIGTERM handler installed.")
+        
+    def disableSigInt(self) :    
+        """Disables the SIGINT signal (which raises KeyboardInterrupt)."""
+        self.logdebug("Disabling SIGINT...")
+        self.oldSigIntHandler = signal.signal(signal.SIGINT, signal.SIG_IGN)
+        self.logdebug("SIGINT disabled.")
+        
+    def enableSigInt(self) :    
+        """Enables the SIGINT signal (which raises KeyboardInterrupt)."""
+        self.logdebug("Enabling SIGINT...")
+        signal.signal(signal.SIGINT, self.oldSigIntHandler)
+        self.logdebug("SIGINT enabled.")
         
     def discoverOtherBackends(self) :    
@@ -238 +251 @@
         self.logdebug("JobOriginatingHostName : %s" % self.ClientHost)
         
+        self.enableSigInt()
         self.logdebug("Backend initialized.")
         
@@ -1154 +1168 @@
             wrapper.exportJobInfo() # re-exports in case it was overwritten
             retcode = wrapper.mainWork()
+        except KeyboardInterrupt :    
+            wrapper.printInfo(_("Job %s interrupted by the administrator !") % wrapper.JobId, "warn")
+            retcode = 0
         except SystemExit, e :    
             retcode = e.code

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.24alpha7 :
      
+        - The cupspykota backend wrapper now accepts to be interrupted
+          with a kill -INT. This causes an immediate and clean abort
+          of the current print job.
+          
         - Matt Hyclak contributed the possibility to store the printing
           history in a MySQL database. See the contributed/ directory