linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saliya's fixes to the 'kill' commands for runsics.py

Browse Source
This commit is contained in:
Ferdi Franceschini
2013-05-16 14:12:41 +10:00
parent 5baf09913c
commit 576f598e76
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
site_ansto/instrument/runsics.py
View File

@@ -57,6 +57,7 @@ def start_cmd(server, args):
else: else:
execenv.update(sicsenv[args.test]) execenv.update(sicsenv[args.test])
start_str = 'sudo -u %s %s/SICServer -d %s' % (args.user, args.dir, args.config) start_str = 'sudo -u %s %s/SICServer -d %s' % (args.user, args.dir, args.config)
# print "DEBUG: start_str:%s" % (start_str)
# Suppress output if launching the script validator # Suppress output if launching the script validator
if (server == 'scriptval'): if (server == 'scriptval'):
with open(os.devnull) as fp: with open(os.devnull) as fp:
@@ -81,18 +82,18 @@ def stop_cmd(server, args):
sock.close() sock.close()
if status_cmd(server, args): if status_cmd(server, args):
print 'Failed to stop %s' % server print 'Failed to stop %s' % server
print 'Try harder dammit!' print "Fragging PID %d with default KILL" % (pid)
subprocess.call(shlex.split('sudo -u root killall SICServer')) subprocess.call(shlex.split('sudo -u root /bin/kill %d' % (pid)))
else: else:
return return
if status_cmd(server, args): if status_cmd(server, args):
print 'Failed again!' print 'Failed again!'
print 'Die damn you! DIE!!' print "Terminating PID %d with EXTREME PREJUDICE (-15)" % (pid)
subprocess.call(shlex.split('sudo -u root killall -s15 SICServer')) subprocess.call(shlex.split('sudo -u root /bin/kill -15 %d' % (pid)))
else: else:
return return
if status_cmd(server, args): if status_cmd(server, args):
print 'Why wont you die!!??' print 'Why wont you die, Powers!!??'
print 'I give up. Try calling a SICS programmer or sysadmin' print 'I give up. Try calling a SICS programmer or sysadmin'