Changeset a9eb577e

Timestamp:

Jan 12, 2012, 5:37:11 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

d17381b, c500bc2, 8d89b3d

Parents:

d994f15

git-author:

Jessica B. Hamrick <jhamrick@…> (01/12/12 17:37:11)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/12/12 17:37:11)

Message:

Add logging configuration option

Location:

server/lib

Files:

• gutenbach-config (modified) (1 diff)
• gutenbach-server (added)
• gutenbach-server.py (modified) (1 diff, 1 prop)
• gutenbach/server/__init__.py (modified) (2 diffs)
• gutenbach/server/player.py (modified) (2 diffs)

server/lib/gutenbach-config

@@ -1 +1 @@
 port: 8000
-loglevel: info
+loglevel: debug
+logfile: gutenbach.log
 
 printers:

server/lib/gutenbach-server.py

@@ +1 @@
+#!/usr/bin/python
+
 import gutenbach.server
 import sys

server/lib/gutenbach/server/__init__.py

@@ -21 +21 @@
 import sys
 import traceback
+import os
+import shutil
 
 # configure and initialize logging
@@ -30 +32 @@
     sys.exit(1)
 
+def new_logfile(logfile):
+    if os.path.exists(logfile):
+        pth = os.path.abspath(os.path.dirname(logfile))
+        filename = os.path.basename(logfile)
+        logfiles = [f for f in os.listdir(pth) if f.startswith(filename + ".")]
+        lognums = [0]
+        for f in logfiles:
+            try:
+                lognums.append(int(f.lstrip(filename + ".")))
+            except TypeError:
+                pass
+        nextnum = max(lognums) + 1
+        shutil.move(logfile, os.path.join(pth, "%s.%d" % (filename, nextnum)))
+
 def start(config):
     global logger
-    loglevel_num = getattr(logging, config['loglevel'].upper())
-    logging.basicConfig(level=loglevel_num)
-    logger = logging.getLogger(__name__)    
+    logkwargs = {}
+    logkwargs['level'] = getattr(logging, config['loglevel'].upper())
+    if 'logfile' in config:
+        logkwargs['filename'] = config['logfile']
+        new_logfile(config['logfile'])            
+    logging.basicConfig(**logkwargs)
+    logger = logging.getLogger(__name__)
+    
     logger.info("Starting Gutenbach server...")
     printers = sorted(config['printers'].keys())

server/lib/gutenbach/server/player.py

@@ -67 +67 @@
             self._done = False
 
-        command = "/usr/bin/mplayer -really-quiet -slave".split()+[self.fh.name]
-        logger.info("Running %r", command)
+        command = ["mplayer", "-really-quiet", "-slave", self.fh.name]
+        logger.info("running '%s'", " ".join(command))
 
         if self._dryrun:
@@ -79 +79 @@
 
         else:
-            # open mplayer
-
             with self.lock:
                 self.player = subprocess.Popen(