Changeset 6effd50 for server

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

Location:

server/lib/gutenbach/server

Files:

• __init__.py (modified) (1 diff)
• printer.py (modified) (2 diffs)
• requests.py (modified) (2 diffs)
• server.py (modified) (2 diffs)

server/lib/gutenbach/server/__init__.py

@@ -2 +2 @@
 import BaseHTTPServer
 import logging
+import sys
 
 # configure logging
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
+
+def error(self, request, client_address):
+    sys.exit(1)
 
 def start():
     server_address = ('', 8000)
     httpd = BaseHTTPServer.HTTPServer(server_address, GutenbachIPPServer)
+    httpd.handle_error = error.__get__(httpd)
     httpd.serve_forever()
 

server/lib/gutenbach/server/printer.py

@@ -61 +61 @@
     def __getattr__(self, attr):
         try:
-            return super(Printer, self).__getattr__(attr)
+            return self.__getattribute__(attr)
         except AttributeError:
             pass
-
-        return super(Printer, self).__getattr__(
-            attr.replace("-", "_"))
+        return self.__getattribute__(attr.replace("-", "_"))
 
     def __hasattr__(self, attr):
-        has = super(Printer, self).__hasattr__(attr)
-        if not has:
-            has = super(Printer, self).__hasattr__(
-                attr.replace("-", "_"))
-        return has
+        try:
+            getattr(self, attr)
+            return True
+        except AttributeError:
+            return False
 
     ## Printer attributes
@@ -156 +154 @@
     def get_printer_attributes(self, request):
         attributes = [(attr, getattr(self, attr)) for attr in self.attributes]
-        attributes = map(lambda x: x if isinstance(x, (tuple, list)) else [x], attributes)
+        attributes = map(lambda x: x if isinstance(x[1], (tuple, list)) else (x[0], [x[1]]),
+                         attributes)
         return attributes
 

server/lib/gutenbach/server/requests.py

@@ -53 +53 @@
         attrs = printer.get_printer_attributes(request)
         ipp_attrs = []
-        for attr, vals in enumerate(attrs):
+        for attr, vals in attrs:
             ipp_vals = [ipp.Value(
                 tag=printer_attribute_value_tags[attr],
@@ -64 +64 @@
         attrs = job.get_job_attributes(request)
         ipp_attrs = []
-        for attr, vals in enumerate(attrs):
+        for attr, vals in attrs:
             ipp_vals = [ipp.Value(
                 tag=job_attribute_value_tags[attr],

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)