diff options
Diffstat (limited to 'ca')
| -rwxr-xr-x | ca/rpki-start-servers | 4 | ||||
| -rw-r--r-- | ca/tests/smoketest.py | 12 | ||||
| -rw-r--r-- | ca/tests/yamlconf.py | 2 | ||||
| -rw-r--r-- | ca/tests/yamltest.py | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ca/rpki-start-servers b/ca/rpki-start-servers index edaffb2e..ede47bec 100755 --- a/ca/rpki-start-servers +++ b/ca/rpki-start-servers @@ -48,9 +48,9 @@ cfg = rpki.config.parser(args.config, "myrpki") def run(name): # pylint: disable=E1103 - cmd = (os.path.join(rpki.autoconf.libexecdir, name), "-c", cfg.filename) + cmd = (os.path.join(rpki.autoconf.libexecdir, name), "--config", cfg.filename) if args.debug: - proc = subprocess.Popen(cmd + ("-d",), + proc = subprocess.Popen(cmd + ("--foreground", "--log-stderr"), stdout = open(os.path.join(args.logdir, name + ".log"), "a"), stderr = subprocess.STDOUT) else: diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py index 46182b52..1ff47aef 100644 --- a/ca/tests/smoketest.py +++ b/ca/tests/smoketest.py @@ -156,7 +156,7 @@ def main(): Main program. """ - rpki.log.init(smoketest_name, use_syslog = False) + rpki.log.init(smoketest_name) rpki.log.info("Starting") pubd_process = None @@ -227,10 +227,10 @@ def main(): try: rpki.log.info("Starting rootd") - rootd_process = subprocess.Popen((prog_python, prog_rootd, "-d", "-c", rootd_name + ".conf")) + rootd_process = subprocess.Popen((prog_python, prog_rootd, "--foreground", "--log-stderr", "--config", rootd_name + ".conf")) rpki.log.info("Starting pubd") - pubd_process = subprocess.Popen((prog_python, prog_pubd, "-d", "-c", pubd_name + ".conf") + + pubd_process = subprocess.Popen((prog_python, prog_pubd, "--foreground", "--log-stderr", "--config", pubd_name + ".conf") + (("-p", pubd_name + ".prof") if args.profile else ())) rpki.log.info("Starting rsyncd") @@ -829,9 +829,9 @@ class allocation(object): Run daemons for this entity. """ rpki.log.info("Running daemons for %s" % self.name) - self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "-d", "-c", self.name + ".conf") + - (("-p", self.name + ".prof") if args.profile else ())) - self.irdbd_process = subprocess.Popen((prog_python, prog_irdbd, "-d", "-c", self.name + ".conf")) + self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "--foreground", "--log-stderr", "--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")) def kill_daemons(self): """ diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py index 3c71d3cd..5a66fe8f 100644 --- a/ca/tests/yamlconf.py +++ b/ca/tests/yamlconf.py @@ -617,7 +617,7 @@ def main(): quiet = args.quiet yaml_file = args.yaml_file - rpki.log.init("yamlconf", use_syslog = False) + rpki.log.init("yamlconf") # Allow optional config file for this tool to override default # passwords: this is mostly so that I can show a complete working diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index 5eb3bd2f..3716bd54 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, "-d", "-c", self.path("rpki.conf")] + cmd = [prog, "--foreground", "--log-stderr", "--config", self.path("rpki.conf")] if args.profile and basename != "rootd": cmd.append("--profile") cmd.append(self.path(basename + ".prof")) @@ -665,7 +665,7 @@ try: if args.pidfile is not None: open(args.pidfile, "w").write("%s\n" % os.getpid()) - rpki.log.init("yamltest", use_syslog = False) + rpki.log.init("yamltest") # Allow optional config file for this tool to override default # passwords: this is mostly so that I can show a complete working |