From 871d0d15c64eeb126767924a3824c8f61e3eda53 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Mon, 15 Oct 2007 17:03:46 +0000 Subject: [PATCH] fix webui kill if already running --- plugins/WebUi/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/WebUi/__init__.py b/plugins/WebUi/__init__.py index eebdb4c1b..788a43c67 100644 --- a/plugins/WebUi/__init__.py +++ b/plugins/WebUi/__init__.py @@ -80,9 +80,9 @@ class plugin_WebUi(object): self.web_server = None if not deluge.common.windows_check(): import commands - status = commands.getstatus('ps x |grep -v grep |grep run_webserver') - if status == 0: - os.kill(commands.getoutput('ps x |grep -v grep |grep run_webserver |awk {\'print $1\'}'), 9) + status = commands.getstatusoutput('ps x |grep -v grep |grep run_webserver') + if status[0] == 0: + os.kill(status[1].split()[0], 9) time.sleep(1) #safe time to wait for kill to finish. self.config_file = deluge.common.CONFIG_DIR + "/webui.conf" self.config = deluge.pref.Preferences(self.config_file, False)