From 81418afbbbb25983801f7f5468a6e76be6bc0382 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Fri, 4 May 2012 01:20:51 -0400 Subject: [PATCH] fix up service module to make it start processes that are listed to be running and to report errors from starting them --- library/service | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/service b/library/service index 7c5d9aeffa..262db4094e 100755 --- a/library/service +++ b/library/service @@ -138,9 +138,9 @@ status = status_stdout + status_stderr running = False -if status_stdout.find("not running") != -1: +if status_stdout.find("stopped") != -1 or rc == 3: running = False -elif status_stdout.find("running") != -1: +elif status_stdout.find("running") != -1 or rc == 0: running = True elif name == 'iptables' and status_stdout.find("ACCEPT") != -1: # iptables status command output is lame @@ -165,7 +165,7 @@ if state or enable: # =========================================== # determine if we are going to change anything - if not running and state == "started": + if not running and state in ("started", "running"): changed = True elif running and state == "stopped": changed = True @@ -183,13 +183,13 @@ if state or enable: elif state == 'restarted': rc1, stdout1, stderr1 = _run("%s %s stop" % (SERVICE, name)) rc2, stdout2, stderr2 = _run("%s %s start" % (SERVICE, name)) - rc_state = rc and rc1 and rc2 + rc_state = rc + rc1 + rc2 stdout = stdout1 + stdout2 stderr = stderr1 + stderr2 out += stdout err += stderr - rc = rc and rc_state + rc = rc + rc_state if rc != 0: