cleanup, make monolitic app work again

diff --git a/gps303/__main__.py b/gps303/__main__.py
index 461c4504e32ceae9e2cc2ccb576866dfc2d78049..5e9a93547daef39425bf9befae0a484ab6f68938 100755 (executable)
--- a/gps303/__main__.py
+++ b/gps303/__main__.py
@@ -1,13 +1,11 @@
-from getopt import getopt
-from logging import getLogger, StreamHandler, DEBUG, INFO
-from logging.handlers import SysLogHandler
+from logging import getLogger
 from select import poll, POLLIN, POLLERR, POLLHUP, POLLPRI
 from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR
 import sys
 from time import time
 
-from .config import readconfig
-from .gps303proto import handle_packet, make_response, LOGIN, set_config
+from . import common
+from .gps303proto import handle_packet, make_response, LOGIN
 from .evstore import initdb, stow
 from .lookaside import prepare_response
 
@@ -15,20 +13,8 @@ CONF = "/etc/gps303.conf"
 
 log = getLogger("gps303")
 
-if __name__.endswith("__main__"):
-    opts, _ = getopt(sys.argv[1:], "c:d")
-    opts = dict(opts)
-    conf = readconfig(opts["-c"] if "-c" in opts else CONF)
-
-    if sys.stdout.isatty():
-        log.addHandler(StreamHandler(sys.stderr))
-    else:
-        log.addHandler(SysLogHandler(address="/dev/log"))
-    log.setLevel(DEBUG if "-d" in opts else INFO)
-    log.info("starting with options: %s", opts)
-
+def runserver(conf):
     initdb(conf.get("storage", "dbfn"))
-    set_config(conf)
 
     ctlsock = socket(AF_INET, SOCK_STREAM)
     ctlsock.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
@@ -98,3 +84,6 @@ if __name__.endswith("__main__"):
                         del clnt_dict[fd]
                 if ev & ~POLLIN:
                     log.warning("unexpected event", ev, "on fd", fd)
+
+if __name__.endswith("__main__"):
+    runserver(common.init(log))

diff --git a/gps303/collector.py b/gps303/collector.py
index 68c95bfb77d0ddbb75e8da64d25f6972d7e94847..08178f272bd57d4d1cd102cbd6c4de45c66fb6fc 100644 (file)
--- a/gps303/collector.py
+++ b/gps303/collector.py
@@ -1,8 +1,6 @@
 """ TCP server that communicates with terminals """
 
-from getopt import getopt
 from logging import getLogger
-from logging.handlers import SysLogHandler
 from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR
 from time import time
 from struct import pack

diff --git a/gps303/gps303proto.py b/gps303/gps303proto.py
index 6fa76550db1031ea901ff55d71998d1aeb9fd640..83ac19cd4d68a67ba06091c8b3e0c9274f027110 100755 (executable)
--- a/gps303/gps303proto.py
+++ b/gps303/gps303proto.py
@@ -25,7 +25,6 @@ __all__ = (
     "make_response",
     "parse_message",
     "proto_by_name",
-    "set_config",
     "GPS303Pkt",
     "UNKNOWN",
     "LOGIN",
@@ -58,7 +57,6 @@ log = getLogger("gps303")
 
 class GPS303Pkt:
     PROTO: int
-    CONFIG = None
 
     def __init__(self, *args, **kwargs):
         assert len(args) == 0
@@ -437,6 +435,3 @@ def make_response(msg, **kwargs):  # DEPRECATED
     inframe = msg.response(**kwargs)
     return None if inframe is None else b"xx" + inframe + b"\r\n"
 
-
-def set_config(config):  # Note that we are setting _class_ attribute
-    GPS303Pkt.CONFIG = config