Changeset 61 for branches/refactor_testable

Timestamp:

09/21/05 22:43:01 (3 years ago)

Author:

docwhat

Message:

r1079@LC2000: docwhat | 2005-09-22T02:42:57.435573Z
Cleaned up logging

Location:

branches/refactor_testable

Files:

• gdhost/server.py (modified) (2 diffs)
• gdhostd (modified) (3 diffs)

branches/refactor_testable/gdhost/server.py

@@ -31 +31 @@
     def handle(self):
         protocol = self.server.protocol
-        log = self.server.log
+        client_ip = self.client_address[0]
+        def log( msg ):
+            self.server.log("%s: %s" % (client_ip, msg))
 
         try:
@@ -62 +64 @@
         # Autodetect ip, if not specified.
         if not ip:
-            ip = self.client_address[0]
+            ip = client_ip
                     
         try:

branches/refactor_testable/gdhostd

@@ -20 +20 @@
 ##
 
-import sys, os, syslog
+import sys, os, syslog, signal
 import gdhost.server as server
 import gdhost.daemon as daemon
@@ -52 +52 @@
                   dest="config", default="/etc/gdhost/config",
                   help="Configuration File" )
+parser.add_option( '-S', '--syslog', action="store_true",
+                   dest="syslog", default=False,
+                   help="Use Syslog to log events. This is forced to true if you run as a daemon." )
 
 if '__main__' == __name__:
     options, commands = parser.parse_args()
+    progname = os.path.basename(sys.argv[0])
 
     if not os.path.exists(options.config):
@@ -63 +67 @@
         retCode = deamon.createDaemon()
 
-    def str_logger( msg ):
-        if not msg.endswith('\n'):
-            msg += '\n'
-        sys.stdout.write( "LOG [%d]: %s" % (os.getpid(),msg) )
+    if options.daemon or options.syslog:
+        def log_info(msg, pri = syslog.LOG_INFO):
+            syslog.openlog('%s[%d]' % ( progname,
+                                        os.getpid()), 0, syslog.LOG_DAEMON)
+            syslog.syslog(pri, msg)
+            syslog.closelog()
+    else:
+        def log_info( msg ):
+            sys.stdout.write( msg )
+            if not msg.endswith('\n'):
+                sys.stdout.write( '\n' )
 
-    def sys_logger(msg, pri = syslog.LOG_INFO):
-        syslog.openlog('%s[%d]' % (os.path.basename(sys.argv[0]), os.getpid()), 0, syslog.LOG_DAEMON)
-        syslog.syslog(pri, msg)
-        syslog.closelog()
+    server = server.Server(options.config,
+                           log_info,
+                           debug=options.debug)
 
-    def QuitMe(signum = None, frame = None):
+    def exitServer(signum = None, frame = None):
         "Quit nicely on the correct signal"
         server.log( "...Shutting down" )
         sys.exit(0)
 
-    import signal
-    server = server.Server(options.config,str_logger,debug=options.debug)
     server.log( "Starting..." )
     signal.signal(signal.SIGHUP, server.reconfig)
-    signal.signal(signal.SIGINT, QuitMe)
-    signal.signal(signal.SIGTERM, QuitMe)
+    signal.signal(signal.SIGINT, exitServer)
+    signal.signal(signal.SIGTERM, exitServer)
 
     server.serve_forever()