Changeset 6effd50 for server/lib/gutenbach/server/server.py

Timestamp:

Dec 20, 2011, 1:47:35 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

cad7502

Parents:

f6c6897

git-author:

Jessica B. Hamrick <jhamrick@…> (12/20/11 13:47:35)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/20/11 13:47:35)

Message:

Fix some errors in server/, handle fatal errors better

File:

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

server/lib/gutenbach/server/server.py

@@ -41 +41 @@
         # is an IPP error, then we can get the error code from the
         # exception itself.
-        except IPPException:
+        except ipp.errors.IPPException:
             exctype, excval, exctb = sys.exc_info()
             excval.update_response(response)
@@ -49 +49 @@
         # as an internal server error
         except Exception:
-            response.operation_id = const.ErrorCodes.INTERNAL_ERROR
+            response.operation_id = ipp.StatusCodes.INTERNAL_ERROR
             logger.error(traceback.format_exc())
 
         # Send the response across HTTP
         logger.debug("Sending response: %s" % repr(response))
+        try:
+            binary = response.packed_value
+        except:
+            logger.fatal(traceback.format_exc())
+            sys.exit(1)
+            
         self.send_response(200, "Gutenbach IPP Response")
         self.send_header("Content-Type", "application/ipp")
         self.send_header("Connection", "close")
         self.end_headers()
-        self.wfile.write(response.packed_value)
+        self.wfile.write(binary)