Changeset aef164a for server/lib/gutenbach/server/requests.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/requests.py (modified) (8 diffs)

server/lib/gutenbach/server/requests.py

@@ -1 +1 @@
 from gutenbach.server.printer import GutenbachPrinter
 import gutenbach.ipp as ipp
-import gutenbach.ipp.constants as const
+import gutenbach.ipp.constants as consts
 import logging
 
@@ -41 +41 @@
         handler = getattr(self, handler_name)
         logger.info("Handling request of type '%s'" % handler_name)
-        response = handler(request)
+
+        # Try to handle the request
+        try:
+            response = handler(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
+
         return response
 
@@ -47 +67 @@
         logger.warning("Received unknown operation 0x%x" % request.operation_id)
         response = ipp.ops.make_empty_response(request)
-        response.operation_id = const.StatusCodes.OPERATION_NOT_SUPPORTED
+        response.operation_id = consts.StatusCodes.OPERATION_NOT_SUPPORTED
         return response
         
@@ -58 +78 @@
         pass
 
-    @handler_for(const.Operations.GET_JOBS)
+    @handler_for(consts.Operations.GET_JOBS)
     def get_jobs(self, request):
         """RFC 2911: 3.2.6 Get-Jobs Operation
@@ -104 +124 @@
         pass
 
-    @handler_for(const.Operations.GET_PRINTER_ATTRIBUTES)
+    @handler_for(consts.Operations.GET_PRINTER_ATTRIBUTES)
     def get_printer_attributes(self, request):
         """RFC 2911: 3.2.5 Get-Printer-Attributes Operation
@@ -217 +237 @@
     ##### CUPS Specific Commands
 
-    @handler_for(const.Operations.CUPS_GET_DEFAULT)
+    @handler_for(consts.Operations.CUPS_GET_DEFAULT)
     def cups_get_default(self, request):
         """The CUPS-Get-Default operation (0x4001) returns the default
@@ -233 +253 @@
         return response
 
-    @handler_for(const.Operations.CUPS_GET_PRINTERS)
+    @handler_for(consts.Operations.CUPS_GET_PRINTERS)
     def cups_get_printers(self, request):
         """The CUPS-Get-Printers operation (0x4002) returns the
@@ -253 +273 @@
         return response
 
-    @handler_for(const.Operations.CUPS_GET_CLASSES)
+    @handler_for(consts.Operations.CUPS_GET_CLASSES)
     def cups_get_classes(self, request):
         """The CUPS-Get-Classes operation (0x4005) returns the printer