X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fcommon.py;h=8afd65edfd65bd6e5efcb4b8df8234d79bccdfd4;hb=095e50cff44cd721962b82e42205b4674c8647f1;hp=44c301d41c591bbd785ef5b077d09a9ac8f338e3;hpb=2052991786319930bccf63f347dbc121774e9018;p=loctrkd.git

diff --git a/gps303/common.py b/gps303/common.py
index 44c301d..8afd65e 100644
--- a/gps303/common.py
+++ b/gps303/common.py
@@ -2,24 +2,41 @@
 
 from configparser import ConfigParser
 from getopt import getopt
-from logging import getLogger, StreamHandler, DEBUG, INFO
+from logging import Formatter, getLogger, StreamHandler, DEBUG, INFO
+from logging.handlers import SysLogHandler
+from pkg_resources import get_distribution, DistributionNotFound
 from sys import argv, stderr, stdout
 
 CONF = "/etc/gps303.conf"
 PORT = 4303
 DBFN = "/var/lib/gps303/gps303.sqlite"
 
+try:
+    version = get_distribution("gps303").version
+except DistributionNotFound:
+    version = "<local>"
 
-def init(log):
-    opts, _ = getopt(argv[1:], "c:d")
+
+def init(log, opts=None):
+    if opts is None:
+        opts, _ = getopt(argv[1:], "c:d")
     opts = dict(opts)
     conf = readconfig(opts["-c"] if "-c" in opts else CONF)
+    log.setLevel(DEBUG if "-d" in opts else INFO)
     if stdout.isatty():
-        log.addHandler(StreamHandler(stderr))
+        hdl = StreamHandler(stderr)
+        hdl.setFormatter(
+            Formatter("%(asctime)s - %(levelname)s - %(message)s")
+        )
+        log.addHandler(hdl)
+        log.debug("%s starting with options: %s", version, opts)
     else:
-        log.addHandler(SysLogHandler(address="/dev/log"))
-    log.setLevel(DEBUG if "-d" in opts else INFO)
-    log.info("starting with options: %s", opts)
+        hdl = SysLogHandler(address="/dev/log")
+        hdl.setFormatter(
+            Formatter("%(name)s[%(process)d]: %(levelname)s - %(message)s")
+        )
+        log.addHandler(hdl)
+        log.info("%s starting with options: %s", version, opts)
     return conf