1 files changed, 7 insertions, 42 deletions
diff --git a/rpki/rtr/main.py b/rpki/rtr/main.py
index 34f5598d..b915f809 100644
--- a/rpki/rtr/main.py
+++ b/rpki/rtr/main.py
@@ -25,28 +25,9 @@ import os
 import sys
 import time
 import logging
-import logging.handlers
-import argparse
 
+import rpki.config
 
-class Formatter(logging.Formatter):
-
-    converter = time.gmtime
-
-    def __init__(self, debug, fmt, datefmt):
-        self.debug = debug
-        super(Formatter, self).__init__(fmt, datefmt)
-
-    def format(self, record):
-        if getattr(record, "connection", None) is None:
-            record.connection = ""
-        return super(Formatter, self).format(record)
-
-    def formatException(self, ei):
-        if self.debug:
-            return super(Formatter, self).formatException(ei)
-        else:
-            return str(ei[1])
 
 def main():
 
@@ -63,32 +44,16 @@ def main():
         def argparse_setup_bgpdump(ignored):
             pass
 
-    argparser = argparse.ArgumentParser(description = __doc__)
-    argparser.add_argument("--debug", action = "store_true", help = "debugging mode")
-    argparser.add_argument("--log-level", default = "debug",
-                           choices = ("debug", "info", "warning", "error", "critical"),
-                           type = lambda s: s.lower())
-    argparser.add_argument("--log-to",
-                           choices = ("syslog", "stderr"))
-    subparsers = argparser.add_subparsers(title = "Commands", metavar = "", dest = "mode")
+    cfg = rpki.config.argparser(section = "rpki-rtr", doc =  __doc__)
+    cfg.argparser.add_argument("--debug", action = "store_true", help = "debugging mode")
+    cfg.add_logging_arguments()
+    subparsers = cfg.argparser.add_subparsers(title = "Commands", metavar = "", dest = "mode")
     argparse_setup_server(subparsers)
     argparse_setup_client(subparsers)
     argparse_setup_generator(subparsers)
     argparse_setup_bgpdump(subparsers)
-    args = argparser.parse_args()
-
-    fmt = "rpki-rtr/" + args.mode + "%(connection)s[%(process)d] %(message)s"
-
-    if (args.log_to or args.default_log_to) == "stderr":
-        handler = logging.StreamHandler()
-        fmt = "%(asctime)s " + fmt
-    elif os.path.exists("/dev/log"):
-        handler = logging.handlers.SysLogHandler("/dev/log")
-    else:
-        handler = logging.handlers.SysLogHandler()
+    args = cfg.argparser.parse_args()
 
-    handler.setFormatter(Formatter(args.debug, fmt, "%Y-%m-%dT%H:%M:%SZ"))
-    logging.root.addHandler(handler)
-    logging.root.setLevel(int(getattr(logging, args.log_level.upper())))
+    cfg.configure_logging(args = args, ident = "rpki-rtr/" + args.mode)
 
     return args.func(args)