codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

really kill

This commit is contained in:
Marcos Pinto 2007-10-14 23:26:55 +00:00
parent 30b5967f12
commit b6dd803a95
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/WebUi/__init__.py
View File

@ -80,7 +80,10 @@ class plugin_WebUi(object):
self.web_server = None self.web_server = None
if not deluge.common.windows_check(): if not deluge.common.windows_check():
if os.WEXITSTATUS(os.system('ps x -o pid,args |grep -v grep |grep -q run_webserver')): if os.WEXITSTATUS(os.system('ps x -o pid,args |grep -v grep |grep -q run_webserver')):
os.system('killall run_webserver') import commands
pid = commands.getoutput('ps x -o pid,args |grep -v grep |grep run_webserver |awk {\'print $1\'}')
os.kill(pid, 9)
time.sleep(1) #safe time to wait for kill to finish.
self.config_file = deluge.common.CONFIG_DIR + "/webui.conf" self.config_file = deluge.common.CONFIG_DIR + "/webui.conf"
self.config = deluge.pref.Preferences(self.config_file, False) self.config = deluge.pref.Preferences(self.config_file, False)
try: try:
@ -159,8 +162,12 @@ class plugin_WebUi(object):
self.web_server.stop_gtk() self.web_server.stop_gtk()
self.web_server = None self.web_server = None
if self.proc: if self.proc:
print "webserver: kill %i" % self.proc.pid if os.WEXITSTATUS(os.system('ps x -o pid,args |grep -v grep |grep -q run_webserver')):
os.system("kill %i" % self.proc.pid) import commands
pid = commands.getoutput('ps x -o pid,args |grep -v grep |grep run_webserver |awk {\'print $1\'}')
os.kill(pid, 9)
# print "webserver: kill %i" % self.proc.pid
# os.system("kill %i" % self.proc.pid)
time.sleep(1) #safe time to wait for kill to finish. time.sleep(1) #safe time to wait for kill to finish.
self.proc = None self.proc = None