From a9f6028ef1214bfed69efd0aff59131327a06b8e Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Sat, 28 Nov 2015 00:01:41 +0200 Subject: fix second try of running daemon: second daemonize_parser() ruins input args --- .../automation/trex_control_plane/server/extended_daemon_runner.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts/automation/trex_control_plane/server/extended_daemon_runner.py') diff --git a/scripts/automation/trex_control_plane/server/extended_daemon_runner.py b/scripts/automation/trex_control_plane/server/extended_daemon_runner.py index 734fa22e..a374db30 100755 --- a/scripts/automation/trex_control_plane/server/extended_daemon_runner.py +++ b/scripts/automation/trex_control_plane/server/extended_daemon_runner.py @@ -19,7 +19,6 @@ def daemonize_parser(parser_obj, action_funcs, help_menu): parser_obj.usage = None parser_obj.add_argument("action", choices=action_funcs, action="store", help=help_menu) - return class ExtendedDaemonRunner(runner.DaemonRunner): @@ -76,7 +75,11 @@ class ExtendedDaemonRunner(runner.DaemonRunner): self.app = app self.daemon_context = daemon.DaemonContext() self.daemon_context.stdin = open(app.stdin_path, 'rt') - self.daemon_context.stdout = open(app.stdout_path, 'w+t') + try: + self.daemon_context.stdout = open(app.stdout_path, 'w+t') + except IOError as err: + app.stdout_path = "/dev/null" + self.daemon_context.stdout = open(app.stdout_path, 'w+t') self.daemon_context.stderr = open(app.stderr_path, 'a+t', buffering=0) -- cgit From 54a8bafe065785fb6c14ff7a4d5b1478e124addc Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Sat, 28 Nov 2015 00:06:33 +0200 Subject: restore comment --- scripts/automation/trex_control_plane/server/extended_daemon_runner.py | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/automation/trex_control_plane/server/extended_daemon_runner.py') diff --git a/scripts/automation/trex_control_plane/server/extended_daemon_runner.py b/scripts/automation/trex_control_plane/server/extended_daemon_runner.py index a374db30..7bc25aac 100755 --- a/scripts/automation/trex_control_plane/server/extended_daemon_runner.py +++ b/scripts/automation/trex_control_plane/server/extended_daemon_runner.py @@ -78,6 +78,7 @@ class ExtendedDaemonRunner(runner.DaemonRunner): try: self.daemon_context.stdout = open(app.stdout_path, 'w+t') except IOError as err: + # catch 'tty' error when launching server from remote location app.stdout_path = "/dev/null" self.daemon_context.stdout = open(app.stdout_path, 'w+t') self.daemon_context.stderr = open(app.stderr_path, -- cgit