diff options
| author | Rob Austein <sra@hactrn.net> | 2014-09-14 21:40:40 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-09-14 21:40:40 +0000 |
| commit | 558a82a19f6771ea264a9d7c56ec089b31643af1 (patch) | |
| tree | e78645e00a00f5fe064226ed173bb00f45273b29 /ca/tests | |
| parent | c874da448d5b25c0c7c47caefda0b366354a3945 (diff) | |
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
Diffstat (limited to 'ca/tests')
| -rw-r--r-- | ca/tests/smoketest.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py index d1b15253..99e2304f 100644 --- a/ca/tests/smoketest.py +++ b/ca/tests/smoketest.py @@ -232,11 +232,13 @@ def main(): try: logger.info("Starting rootd") - rootd_process = subprocess.Popen((prog_python, prog_rootd, "--foreground", "--log-stdout", "--log-level", "debug", "--config", rootd_name + ".conf")) + rootd_process = subprocess.Popen((prog_python, prog_rootd, "--foreground", "--log-stdout", "--log-level", "debug"), + env = dict(os.environ, RPKI_CONF = rootd_name + ".conf")) logger.info("Starting pubd") - 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 ())) + pubd_process = subprocess.Popen((prog_python, prog_pubd, "--foreground", "--log-stdout", "--log-level", "debug") + + (("-p", pubd_name + ".prof") if args.profile else ()), + env = dict(os.environ, RPKI_CONF = pubd_name + ".conf")) logger.info("Starting rsyncd") rsyncd_process = subprocess.Popen((prog_rsyncd, "--daemon", "--no-detach", "--config", rsyncd_name + ".conf")) @@ -848,9 +850,12 @@ 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-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-stdout", "--log-level", "debug", "--config", self.name + ".conf")) + env = dict(os.environ, RPKI_CONF = self.name + ".conf") + self.rpkid_process = subprocess.Popen((prog_python, prog_rpkid, "--foreground", "--log-stdout", "--log-level", "debug") + + (("--profile", self.name + ".prof") if args.profile else ()), + env = env) + self.irdbd_process = subprocess.Popen((prog_python, prog_irdbd, "--foreground", "--log-stdout", "--log-level", "debug"), + env = env) def kill_daemons(self): """ |