Changeset 28b2e89

Timestamp:

Jan 22, 2012, 10:10:47 PM (12 years ago)

Author:

Steven Allen <steven@…>

Branches:

no-cups

Children:

ca1cfa9

Parents:

410ad69

git-author:

Steven Allen <steven@…> (01/22/12 22:10:47)

git-committer:

Steven Allen <steven@…> (01/22/12 22:10:47)

Message:

Stop the printer on error (so that gutenbach actually exits on SIGINT/SIGTERM.

File:

• server/lib/gutenbach/server/__init__.py (modified) (2 diffs)

server/lib/gutenbach/server/__init__.py

@@ -44 +44 @@
     logger.fatal(traceback.format_exc())
     self.gutenbach_printer.running = False
-    sys.exit(1)
+    try:
+        if self.gutenbach_printer.isAlive():
+            self.gutenbach_printer.stop()
+    finally:
+        sys.exit(1)
 
 def new_logfile(logfile):
@@ -80 +84 @@
     httpd.handle_error = error.__get__(httpd)
     httpd.gutenbach_printer = gutenbach
-    while gutenbach.isAlive():
-        try:
+    try:
+        while gutenbach.isAlive():
             httpd.handle_request()
-        except:
-            error(httpd)
+    except:
+        error(httpd)
 
 __all__.append('start')