diff options
author | 2015-11-28 00:02:00 +0200 | |
---|---|---|
committer | 2015-11-28 00:02:00 +0200 | |
commit | dfeb27376f11a16e0ea4f4bfd30bd5acea70f629 (patch) | |
tree | b8327c39da5b4fc293c26239100d099959d277d3 /scripts/automation/trex_control_plane/server/trex_daemon_server.py | |
parent | 27a7103d501e9a0bf005d657cb3f7c51a72eca6b (diff) | |
parent | a9f6028ef1214bfed69efd0aff59131327a06b8e (diff) |
Merge branch 'fix_second_daemon_try_without_tty'
Diffstat (limited to 'scripts/automation/trex_control_plane/server/trex_daemon_server.py')
-rwxr-xr-x | scripts/automation/trex_control_plane/server/trex_daemon_server.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/automation/trex_control_plane/server/trex_daemon_server.py b/scripts/automation/trex_control_plane/server/trex_daemon_server.py index ec07cb8a..9784d42a 100755 --- a/scripts/automation/trex_control_plane/server/trex_daemon_server.py +++ b/scripts/automation/trex_control_plane/server/trex_daemon_server.py @@ -57,15 +57,7 @@ def main (): print "Launching user must have sudo privileges in order to run TRex daemon.\nTerminating daemon process." exit(-1) - try: - daemon_runner = ExtendedDaemonRunner(trex_app, trex_parser) - except IOError as err: - # catch 'tty' error when launching server from remote location - if err.errno == errno.ENXIO: - trex_app.stdout_path = "/dev/null" - daemon_runner = ExtendedDaemonRunner(trex_app, trex_parser) - else: - raise + daemon_runner = ExtendedDaemonRunner(trex_app, trex_parser) #This ensures that the logger file handle does not get closed during daemonization daemon_runner.daemon_context.files_preserve=[handler.stream] |