diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-08-01 18:48:06 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-08-01 18:48:06 +0300 |
| commit | 511854b7a8fe289603cb4475a39d713244846ebf (patch) | |
| tree | 16efc4f16c93e4d0ad6351287d8710a9583cc4fa /scripts/master_daemon.py | |
| parent | 5add0c5625a0e46e1451806ca54070b5bcec7ccb (diff) | |
Python3 support for Stateful daemon
Python 3.5 support in ZMQ
Verify ZMQ health in Stateful daemon
Add get_trex_config() command to Stateful daemon
Strip debug info on Python ZMQ .so files
Diffstat (limited to 'scripts/master_daemon.py')
| -rwxr-xr-x | scripts/master_daemon.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/master_daemon.py b/scripts/master_daemon.py index 3a9d7ffe..381a7eaf 100755 --- a/scripts/master_daemon.py +++ b/scripts/master_daemon.py @@ -31,7 +31,7 @@ def get_trex_path(): def update_trex(package_path = 'http://trex-tgn.cisco.com/trex/release/latest'): if not args.allow_update: - raise Exception('Updading server not allowed') + raise Exception('Updating server not allowed') # getting new package if package_path.startswith('http://'): file_name = package_path.split('/')[-1] @@ -185,8 +185,8 @@ args.trex_dir = os.path.abspath(args.trex_dir) args.daemon_type = args.daemon_type or 'master_daemon' stl_rpc_proxy_dir = os.path.join(args.trex_dir, 'automation', 'trex_control_plane', 'stl', 'examples') -stl_rpc_proxy = SingletonDaemon('Stateless RPC proxy', 'trex_stl_rpc_proxy', args.stl_rpc_proxy_port, './rpc_proxy_server.py', stl_rpc_proxy_dir) -trex_daemon_server = SingletonDaemon('TRex daemon server', 'trex_daemon_server', args.trex_daemon_port, './trex_daemon_server start', args.trex_dir) +stl_rpc_proxy = SingletonDaemon('Stateless RPC proxy', 'trex_stl_rpc_proxy', args.stl_rpc_proxy_port, '%s rpc_proxy_server.py' % sys.executable, stl_rpc_proxy_dir) +trex_daemon_server = SingletonDaemon('TRex daemon server', 'trex_daemon_server', args.trex_daemon_port, '%s trex_daemon_server start' % sys.executable, args.trex_dir) master_daemon = SingletonDaemon('Master daemon', 'trex_master_daemon', args.master_port, start_master_daemon) # add ourself for easier check if running, kill etc. tmp_dir = '/tmp/trex-tmp' |