Changeset 609a9b0

Timestamp:

Jan 12, 2012, 1:28:05 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

ef387cf

Parents:

2620618

git-author:

Jessica B. Hamrick <jhamrick@…> (01/12/12 01:28:05)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/12/12 01:28:05)

Message:

Add basic configuration file support

Location:

server

Files:

• lib/gutenbach-config (added)
• lib/gutenbach-server.py (modified) (1 diff)
• lib/gutenbach/ipp/core/constants.py (modified) (2 diffs)
• lib/gutenbach/server/__init__.py (modified) (2 diffs)
• lib/gutenbach/server/job.py (modified) (1 diff)
• lib/gutenbach/server/printer.py (modified) (2 diffs)
• test/server/job.py (modified) (1 diff)

server/lib/gutenbach-server.py

@@ -1 +1 @@
 import gutenbach.server
-gutenbach.server.start()
+import sys
+import os
+import yaml
+
+if len(sys.argv) != 2:
+    print "Invalid number of arguments: %d" % len(sys.argv)
+    sys.exit(1)
+
+config = sys.argv[1]
+if not os.path.exists(config):
+    print "Invalid config: %s" % config
+    sys.exit(1)
+
+conf_dict = yaml.load(open(config, "r"))
+print "Loaded configuration file:"
+print conf_dict
+    
+gutenbach.server.start(conf_dict)

server/lib/gutenbach/ipp/core/constants.py

@@ -1 +1 @@
 __all__ = [
-    'MiscConstants',
     'JobStates',
     'PrinterStates',
@@ -16 +15 @@
     'CharacterStringTags',
 ]
-
-class MiscConstants():
-    """Miscellaneous config options for the IPP server.
-    
-    """
-    
-    IPP_VERSION = "1.1"
-    IPP_PORT = 8000
-
-    def __init__(self): pass
 
 class JobStates():

server/lib/gutenbach/server/__init__.py

@@ -23 +23 @@
 
 # configure and initialize logging
-logging.basicConfig(level=logging.DEBUG)
-logger = logging.getLogger(__name__)
+logger = None
 
 def error(self, request=None, client_address=None):
@@ -31 +30 @@
     sys.exit(1)
 
-def start():
+def start(config):
+    global logger
+    loglevel_num = getattr(logging, config['loglevel'].upper())
+    logging.basicConfig(level=loglevel_num)
+    logger = logging.getLogger(__name__)    
     logger.info("Starting Gutenbach server...")
-    gutenbach = GutenbachPrinter("test")
+    printers = sorted(config['printers'].keys())
+    gutenbach = GutenbachPrinter(printers[0], config['printers'][printers[0]])
     gutenbach.start()
 
     logger.info("Starting IPP server...")
-    server_address = ('', 8000)
+    server_address = ('', config['port'])
     httpd = BaseHTTPServer.HTTPServer(server_address, IPPServer)
     httpd.handle_error = error.__get__(httpd)

server/lib/gutenbach/server/job.py

@@ -331 +331 @@
             _aborted()
 
-
+    def restart(self):
+        # XXX: Todo
+        pass

server/lib/gutenbach/server/printer.py

@@ -69 +69 @@
     ]
         
-    def __init__(self, name, *args, **kwargs):
+    def __init__(self, name, config, *args, **kwargs):
 
         super(GutenbachPrinter, self).__init__(*args, **kwargs)
         
         self.name = name
+        self.config = config
         self.time_created = int(time.time())
 
@@ -207 +208 @@
     @property
     def ipp_versions_supported(self):
-        return ipp.IppVersionsSupported("1.0", "1.1")
+        return ipp.IppVersionsSupported(*self.config['ipp-versions'])
 
     # XXX: We should query ourself for the supported operations

server/test/server/job.py

@@ -205 +205 @@
         self.assertTrue(self.job.is_aborted)
 
+    def testRestart(self):
+        # XXX: Todo
+        pass
+
 if __name__ == "__main__":
     unittest.main()