From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Tue, 2 Dec 2008 03:44:13 +0000 (+0000)
Subject: Use codemux condrestart.
X-Git-Tag: NodeManager-1.7-38~4
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=9eb77020a24ba1e921f0375a10ab3faab9665178

Use codemux condrestart.
---

diff --git a/plugins/codemux.py b/plugins/codemux.py
index 7b11350..aad28b1 100644
--- a/plugins/codemux.py
+++ b/plugins/codemux.py
@@ -118,13 +118,4 @@ def parseConf(conf = CODEMUXCONF):
 
 def restartService():
     logger.log("codemux:  Restarting codemux service")
-    os.system("/etc/init.d/codemux stop")
-    f = os.popen("/sbin/pidof codemux")
-    tmp = f.readlines()
-    f.close()
-    if len(tmp) > 0: 
-        pids = tmp[0].rstrip("\n").split()
-        for pid in pids:
-            logger.log("codemux:  Killing stalled pid %s" % pid, 2)
-            os.kill(pid, 9)
-    os.system("/etc/init.d/codemux start")
+    os.system("/etc/init.d/codemux condrestart")