diff options
| -rw-r--r-- | ca/tests/smoketest.py | 8 | ||||
| -rw-r--r-- | ca/tests/yamltest.py | 2 | ||||
| -rw-r--r-- | rpki/log.py | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py index b8472ba3..87927a81 100644 --- a/ca/tests/smoketest.py +++ b/ca/tests/smoketest.py @@ -230,10 +230,10 @@ def main(): try: logger.info("Starting rootd") - rootd_process = subprocess.Popen((prog_python, prog_rootd, "--foreground", "--log-stderr", "--config", rootd_name + ".conf")) + rootd_process = subprocess.Popen((prog_python, prog_rootd, "--foreground", "--log-stdout", "--log-level", "debug", "--config", rootd_name + ".conf")) logger.info("Starting pubd") - pubd_process = subprocess.Popen((prog_python, prog_pubd, "--foreground", "--log-stderr", "--config", pubd_name + ".conf") + + pubd_process = subprocess.Popen((prog_python, prog_pubd, "--foreground", "--log-stdout", "--log-level", "debug", "--config", pubd_name + ".conf") + (("-p", pubd_name + ".prof") if args.profile else ())) logger.info("Starting rsyncd") @@ -832,9 +832,9 @@ class allocation(object): Run daemons for this entity. """ logger.info("Running daemons for %s" % self.name) - self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "--foreground", "--log-stderr", "--config", self.name + ".conf") + + self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "--foreground", "--log-stdout", "--log-level", "debug", "--config", self.name + ".conf") + (("--profile", self.name + ".prof") if args.profile else ())) - self.irdbd_process = subprocess.Popen((prog_python, prog_irdbd, "--foreground", "--log-stderr", "--config", self.name + ".conf")) + self.irdbd_process = subprocess.Popen((prog_python, prog_irdbd, "--foreground", "--log-stdout", "--log-level", "debug", "--config", self.name + ".conf")) def kill_daemons(self): """ diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index 3716bd54..f8be9c65 100644 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -553,7 +553,7 @@ class allocation(object): representing the running daemon. """ basename = os.path.splitext(os.path.basename(prog))[0] - cmd = [prog, "--foreground", "--log-stderr", "--config", self.path("rpki.conf")] + cmd = [prog, "--foreground", "--log-stderr", "--log-level", "debug", "--config", self.path("rpki.conf")] if args.profile and basename != "rootd": cmd.append("--profile") cmd.append(self.path(basename + ".prof")) diff --git a/rpki/log.py b/rpki/log.py index d68a1da0..bf9185e8 100644 --- a/rpki/log.py +++ b/rpki/log.py @@ -77,18 +77,14 @@ def argparse_setup(parser): setattr(namespace, self.dest, values[0]) setattr(namespace, self.dest + "_maxBytes", int(values[1]) * 1024) setattr(namespace, self.dest + "_backupCount", int(values[2])) - if len(values) > 3: - raise ValueError class TimedRotatingFile(argparse.Action): def __call__(self, parser, namespace, values, option_string = None): setattr(namespace, self.dest, values[0]) setattr(namespace, self.dest + "_interval", int(values[1])) setattr(namespace, self.dest + "_backupCount", int(values[2])) - if len(values) > 3: - raise ValueError - parser.add_argument("--log-level", default = logging.DEBUG, + parser.add_argument("--log-level", default = logging.WARNING, choices = ("debug", "info", "warning", "error", "critical"), type = lambda s: int(getattr(logging, s.upper())), help = "how verbosely to log") |