aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-05-02 00:26:07 +0000
committerRob Austein <sra@hactrn.net>2014-05-02 00:26:07 +0000
commit3322aabdc497d2f9a7cc0a386497ee8d7fbbdb6a (patch)
treea518d24cffea35ec330252afb3360cb7fcbaed9b
parentdf7e734b41c94bd0d2d175ef93dbdd915aa1185a (diff)
Handle listener arguments correctly.
svn path=/trunk/; revision=5823
-rw-r--r--rpki/rtr/server.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/rpki/rtr/server.py b/rpki/rtr/server.py
index c403541f..f1b741f9 100644
--- a/rpki/rtr/server.py
+++ b/rpki/rtr/server.py
@@ -500,11 +500,7 @@ def listener_main(args):
# Perhaps we should daemonize? Deal with that later.
- if args.rpki_rtr_dir:
- try:
- os.chdir(args.rpki_rtr_dir)
- except OSError, e:
- sys.exit(e)
+ # server_main() handles args.rpki_rtr_dir.
listener = None
try:
@@ -531,7 +527,7 @@ def listener_main(args):
os.dup2(s.fileno(), 1) # pylint: disable=E1103
s.close()
#os.closerange(3, os.sysconf("SC_OPEN_MAX"))
- server_main(())
+ server_main(args)
sys.exit()
else:
logging.debug("[Spawned server %d]", pid)