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

Timestamp:

Dec 27, 2011, 7:03:46 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

7c143c9

Parents:

1037115

git-author:

Jessica B. Hamrick <jhamrick@…> (12/27/11 19:03:46)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/27/11 19:03:46)

Message:

Fix error with HTTP server recreating printer objects

File:

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

server/lib/gutenbach/server/server.py

@@ -9 +9 @@
 logger = logging.getLogger(__name__)
 
+# initialize handler
+handler = GutenbachRequestHandler()
+
 class GutenbachIPPServer(BaseHTTPServer.BaseHTTPRequestHandler):
-    def setup(self):
-        self.root = GutenbachRequestHandler()
-        BaseHTTPServer.BaseHTTPRequestHandler.setup(self)
-
-    def handle_one_request(self):
-        self.raw_requestline = self.rfile.readline()
-        if not self.raw_requestline:
-            self.close_connection = 1
-            return
-        if not self.parse_request(): # An error code has been sent, just exit
-            return
-        self.handle_ipp()
-
-    def handle_ipp(self):
+    def do_POST(self):
         # Receive a request
         length = int(self.headers.getheader('content-length', 0))
+        if length == 0:
+            logger.warning("content-length == 0")
+            return
         request = ipp.Request(request=self.rfile, length=length)
 
@@ -33 +26 @@
         logger.debug("Received request: %s" % repr(request))
         try:
-            response = self.root.handle(request)
+            response = handler.handle(request)
         except:
             logger.fatal(traceback.format_exc())