From 10b6151727182e7caa7fdfad2d67e406e3afc726 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 25 Jan 2013 07:39:13 +0000 Subject: Clean up and extend rpki.log.init() to support things like letting the GUI provide its own file-like object as a destination for logging. See #396. svn path=/trunk/; revision=4979 --- rpkid/rpki/rootd.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'rpkid/rpki/rootd.py') diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index 6da7081b..a74194ea 100644 --- a/rpkid/rpki/rootd.py +++ b/rpkid/rpki/rootd.py @@ -332,6 +332,7 @@ class main(object): time.tzset() self.cfg_file = None + use_syslog = True opts, argv = getopt.getopt(sys.argv[1:], "c:dfh?", ["config=", "debug", "foreground", "help"]) for o, a in opts: @@ -341,7 +342,7 @@ class main(object): elif o in ("-c", "--config"): self.cfg_file = a elif o in ("-d", "--debug"): - rpki.log.use_syslog = False + use_syslog = False self.foreground = True elif o in ("-f", "--foreground"): self.foreground = True @@ -349,7 +350,7 @@ class main(object): if argv: raise rpki.exceptions.CommandParseFailure, "Unexpected arguments %s" % argv - rpki.log.init("rootd") + rpki.log.init("rootd", use_syslog = use_syslog) self.cfg = rpki.config.parser(self.cfg_file, "rootd") self.cfg.set_global_flags() -- cgit v1.2.3