Changeset 11a08b0 for fedd/fedd.py

Timestamp:

Oct 7, 2008 6:12:57 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

0ea11af

Parents:

8ecfbad

Message:

decent logging

File:

• fedd/fedd.py (modified) (6 diffs)

fedd/fedd.py

@@ -19 +19 @@
 
 from threading import *
+from signal import signal, pause, SIGINT, SIGTERM
+from select import select
+import logging
 
 # The SSL server here is based on the implementation described at
@@ -169 +172 @@
 
         self.set_defaults(host="localhost", port=23235, transport="soap",
-                debug=0)
+                logfile=None, debug=0)
 
         self.add_option("-d", "--debug", action="count", dest="debug", 
@@ -177 +180 @@
         self.add_option("-H", "--host", action="store", type="string",
                 dest="host", help="Hostname to listen on (default %default)")
+        self.add_option("-l", "--logfile", action="store", dest="logfile", 
+                help="File to send log messages to")
         self.add_option("-p", "--port", action="store", type="int",
                 dest="port", help="Port to listen on (default %default)")
@@ -188 +193 @@
                 const=sys.stderr, help="Print SOAP exchange to stderr")
 
+servers_active = True
+
+log_params = {\
+        'format': "%(asctime)s %(levelname)-8s %(message)s",\
+        'datefmt': '%a, %d %b %Y %H:%M:%S'\
+    }
+
+def shutdown(sig, frame):
+    global servers_active, flog
+    servers_active = False
+    flog.info("Received signal %d, shutting down" % sig);
+
 def run_server(s):
-    if s: s.serve_forever()
+    global servers_active   # Not strictly needed: servers_active is only read
+
+    if s: 
+        while servers_active:
+            i, o, e = select((s,), (), (), 5.0)
+            if s in i:
+                s.handle_request()
 
 services = [ ]
@@ -195 +218 @@
 
 opts, args = fedd_opts().parse_args()
+
+flog = logging.getLogger("fedd")
+ffmt = logging.Formatter("%(asctime)s %(levelname)-8s %(message)s",
+        '%a, %d %b %Y %H:%M:%S')
+
+if opts.logfile: fh = logging.FileHandler(opts.logfile)
+else: fh = logging.StreamHandler(sys.stdout)
+
+# The handler will print anything, setting the logger level will affect what
+# gets recorded.
+fh.setLevel(logging.DEBUG)
+
+if opts.debug: flog.setLevel(logging.DEBUG)
+else: flog.setLevel(logging.INFO)
+
+fh.setFormatter(ffmt)
+flog.addHandler(fh)
+
 
 if opts.configfile != None: 
@@ -239 +280 @@
     elif s[0] == "xmlrpc":
         servers.append(fedd_server(s[1], fedd_xmlrpc_handler, ctx, impl))
-    else: print >>sys.stderr, "Unknown transport: %s" % s[0]
+    else: flog.warning("Unknown transport: %s" % s[0])
+
+signal(SIGINT, shutdown)
+signal(SIGTERM, shutdown)
 
 for s in servers:
-    t = Thread(target=run_server, args=(s,))
-    t.start()
+    if s:
+        t = Thread(target=run_server, args=(s,))
+        t.start()
+
+pause()