Changeset aef164a for server/lib/gutenbach/server/server.py

Timestamp:

Dec 20, 2011, 3:24:01 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

5e44432

Parents:

59a1d4a

git-author:

Jessica B. Hamrick <jhamrick@…> (12/20/11 15:24:01)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/20/11 15:24:01)

Message:

Move ipp error handling out of the server and into server/requests

File:

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

server/lib/gutenbach/server/server.py

@@ -3 +3 @@
 import gutenbach.ipp as ipp
 import logging
+import sys
 import traceback
-import sys
 
 # initialize logger
@@ -27 +27 @@
         length = int(self.headers.getheader('content-length', 0))
         request = ipp.Request(request=self.rfile, length=length)
-        logger.debug("Received request: %s" % repr(request))
 
         # Get the handler and pass it the request and response
         # objects.  It will fill in values for the response object or
-        # thrown an error.
+        # throw a fatal error.
+        logger.debug("Received request: %s" % repr(request))
         try:
             response = self.root.handle(request)
-            
-        # Handle any errors that occur.  If an exception occurs that
-        # is an IPP error, then we can get the error code from the
-        # exception itself.
-        except ipp.errors.IPPException:
-            exctype, excval, exctb = sys.exc_info()
-            logger.error(traceback.format_exc())
-            response = ipp.ops.make_empty_response(request)
-            excval.update_response(response)
-
-        # If it wasn't an IPP error, then it's our fault, so mark it
-        # as an internal server error
-        except Exception:
-            logger.error(traceback.format_exc())
-            response = ipp.ops.make_empty_response(request)
-            response.operation_id = ipp.StatusCodes.INTERNAL_ERROR
+        except:
+            logger.fatal(traceback.format_exc())
+            sys.exit(1)
 
         # Send the response across HTTP