aboutsummaryrefslogtreecommitdiff
path: root/rpkid/rpki/pubd.py
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid/rpki/pubd.py')
-rw-r--r--rpkid/rpki/pubd.py105
1 files changed, 40 insertions, 65 deletions
diff --git a/rpkid/rpki/pubd.py b/rpkid/rpki/pubd.py
index 7c5426bd..17a79ebf 100644
--- a/rpkid/rpki/pubd.py
+++ b/rpkid/rpki/pubd.py
@@ -1,46 +1,29 @@
"""
RPKI publication engine.
-
-Usage: python pubd.py [ { -c | --config } configfile ]
- [ { -d | --debug } ]
- [ { -f | --foreground } ]
- [ { -h | --help } ]
- [ { -p | --profile } outputfile ]
-
-$Id$
-
-Copyright (C) 2009--2012 Internet Systems Consortium ("ISC")
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN")
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
"""
+# $Id$
+#
+# Copyright (C) 2013--2014 Dragon Research Labs ("DRL")
+# Portions copyright (C) 2009--2012 Internet Systems Consortium ("ISC")
+# Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN")
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notices and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND DRL, ISC, AND ARIN DISCLAIM ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DRL,
+# ISC, OR ARIN BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
import os
import time
-import getopt
+import argparse
import sys
import re
import rpki.resource_set
@@ -65,38 +48,30 @@ class main(object):
os.environ["TZ"] = "UTC"
time.tzset()
- self.cfg_file = None
- self.profile = False
- self.foreground = False
self.irbe_cms_timestamp = None
- use_syslog = True
-
- opts, argv = getopt.getopt(sys.argv[1:], "c:dfhp:?",
- ["config=", "debug", "foreground", "help", "profile="])
- for o, a in opts:
- if o in ("-h", "--help", "-?"):
- print __doc__
- sys.exit(0)
- elif o in ("-c", "--config"):
- self.cfg_file = a
- elif o in ("-d", "--debug"):
- use_syslog = False
- self.foreground = True
- elif o in ("-f", "--foreground"):
- self.foreground = True
- elif o in ("-p", "--profile"):
- self.profile = a
- if argv:
- raise rpki.exceptions.CommandParseFailure, "Unexpected arguments %s" % argv
-
- rpki.log.init("pubd", use_syslog = use_syslog)
-
- self.cfg = rpki.config.parser(self.cfg_file, "pubd")
+ parser = argparse.ArgumentParser(description = __doc__)
+ parser.add_argument("-c", "--config",
+ help = "override default location of configuration file")
+ parser.add_argument("-d", "--debug", action = "store_true",
+ help = "enable debugging mode")
+ parser.add_argument("-f", "--foreground", action = "store_true",
+ help = "do not daemonize")
+ parser.add_argument("--pidfile",
+ help = "override default location of pid file")
+ parser.add_argument("--profile",
+ help = "enable profiling, saving data to PROFILE")
+ args = parser.parse_args()
+
+ self.profile = args.profile
+
+ rpki.log.init("pubd", use_syslog = not args.debug)
+
+ self.cfg = rpki.config.parser(args.config, "pubd")
self.cfg.set_global_flags()
- if not self.foreground:
- rpki.daemonize.daemon()
+ if not args.foreground and not args.debug:
+ rpki.daemonize.daemon(pidfile = args.pidfile)
if self.profile:
import cProfile