From 3968bd3e0ffa3481ea38dad8955f361e2e1fd9d5 Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 30 Mar 2017 09:58:16 +0200 Subject: [PATCH] Closedown --- script/local.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/local.py b/script/local.py index e034947..ec013e0 100755 --- a/script/local.py +++ b/script/local.py @@ -312,6 +312,7 @@ def _get_camtool_port(): def is_camtool_running(): return int(exec_cmd("pgrep " + CAMTOOL_SERVER_SCRIPT + " | wc -l")) > 0 + #return int(exec_cmd('pgrep -f "' + CAMTOOL_SERVER_SCRIPT + ' -p ' + _get_camtool_port() + '" | wc -l')) > 0 def kill_camtool(): #return exec_cmd("killall -9 " + CAMTOOL_SERVER_SCRIPT) @@ -319,8 +320,8 @@ def kill_camtool(): def _run_camtool(): try: - cmd = "source /opt/gfa/python\n" - cmd = cmd + CAMTOOL_SERVER_SCRIPT + " -p " + _get_camtool_port() + " -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n > /dev/null &" + #cmd = "source /opt/gfa/python\n" + cmd = CAMTOOL_SERVER_SCRIPT + " -p " + _get_camtool_port() + " -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n > /dev/null &" print exec_cmd(cmd) except: import traceback