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

Timestamp:

Dec 20, 2011, 3:11:32 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

59a1d4a

Parents:

cad7502

git-author:

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

git-committer:

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

Message:

Move more ipp-specific code into ipp/operations from server/requests; Fix more bugs

File:

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

server/lib/gutenbach/server/server.py

@@ -29 +29 @@
         logger.debug("Received request: %s" % repr(request))
 
-        # Create an empty response object
-        response = ipp.ops.make_empty_response(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.
         try:
-            self.root.handle(request, response)
+            response = self.root.handle(request)
             
         # Handle any errors that occur.  If an exception occurs that
@@ -43 +40 @@
         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)
-            logger.error(traceback.format_exc())
 
         # 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
-            logger.error(traceback.format_exc())
 
         # Send the response across HTTP