From 429adae788694f109174e35467c49d13b9533fe2 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 13 Sep 2014 03:56:54 +0000 Subject: Groundwork for Django ORM world conquest: sort out settings.py mess. svn path=/branches/tk713/; revision=5948 --- rpki/rpkid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpki/rpkid.py') diff --git a/rpki/rpkid.py b/rpki/rpkid.py index 36ee2ea9..db81d56f 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -75,7 +75,7 @@ class main(object): rpki.log.init("rpkid", args) - self.cfg = rpki.config.parser(args.config, "rpkid") + self.cfg = rpki.config.parser(set_filename = args.config, section = "rpkid") self.cfg.set_global_flags() if not args.foreground: -- cgit v1.2.3 From 558a82a19f6771ea264a9d7c56ec089b31643af1 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 14 Sep 2014 21:40:40 +0000 Subject: Remove --config arguments from all daemons, as part of simplifying startup procedure. This may be temporary, as processing --help without a configuration file may require deferring all Django imports until late enough that --config would work too. Defer for now. svn path=/branches/tk713/; revision=5953 --- rpki/rpkid.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'rpki/rpkid.py') diff --git a/rpki/rpkid.py b/rpki/rpkid.py index db81d56f..13be2fd2 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -60,8 +60,6 @@ class main(object): self.task_queue = [] parser = argparse.ArgumentParser(description = __doc__) - parser.add_argument("-c", "--config", - help = "override default location of configuration file") parser.add_argument("-f", "--foreground", action = "store_true", help = "do not daemonize") parser.add_argument("--pidfile", @@ -75,7 +73,7 @@ class main(object): rpki.log.init("rpkid", args) - self.cfg = rpki.config.parser(set_filename = args.config, section = "rpkid") + self.cfg = rpki.config.parser(section = "rpkid") self.cfg.set_global_flags() if not args.foreground: -- cgit v1.2.3