Changeset dc40fe9

Timestamp:

Dec 20, 2011, 11:56:11 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

cf32fee

Parents:

5b3a81e

git-author:

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

git-committer:

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

Message:

Update server/server.py to leave IPP object construction to ipp/operations or ipp/exceptions

File:

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

server/lib/gutenbach/server/server.py

@@ -2 +2 @@
 import BaseHTTPServer
 import gutenbach.ipp as ipp
-import gutenbach.ipp.constants as const
 import logging
 import traceback
+import sys
 
 # initialize logger
@@ -29 +29 @@
         logger.debug("Received request: %s" % repr(request))
 
-        # Operation attributes -- typically the same for any request
-        attributes = [
-            ipp.Attribute(
-                'attributes-charset',
-                [ipp.Value(ipp.Tags.CHARSET, 'utf-8')]),
-            ipp.Attribute(
-                'attributes-natural-language',
-                [ipp.Value(ipp.Tags.NATURAL_LANGUAGE, 'en-us')])
-            ]
-        # Put the operation attributes in a group
-        attribute_group = ipp.AttributeGroup(
-            const.AttributeTags.OPERATION,
-            attributes)
+        # Create an empty response object
+        response = ipp.ops.make_empty_response(request)
 
-        # Set up the default response -- handlers will override these
-        # values if they need to
-        response_kwargs = {}
-        response_kwargs['version']          = request.version
-        response_kwargs['operation_id']     = const.StatusCodes.OK
-        response_kwargs['request_id']       = request.request_id
-        response_kwargs['attribute_groups'] = [attribute_group]
-        response = ipp.Request(**response_kwargs)
-
-        # Get the handler and pass it the request and response objects
+        # 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)
-        except:
-            response.operation_id = const.StatusCodes.INTERNAL_ERROR
+            
+        # 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 IPPException:
+            exctype, excval, exctb = sys.exc_info()
+            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:
+            response.operation_id = const.ErrorCodes.INTERNAL_ERROR
             logger.error(traceback.format_exc())