Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > e536fc0c6270ec1d92a0fd41bb1f8360 > files > 70

rgmanager-2.0.52-28.el5_8.2.src.rpm

From 9b5d039ecab105db426b112e865be59feb41a592 Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lhh@redhat.com>
Date: Thu, 5 Jan 2012 09:03:28 -0500
Subject: [PATCH] rgmanager: Fix call to service_status()

This patch simply fixes the calls to service_status(), the
s_trans variable was being incorrectly set.

Resolves: rhbz#743214

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/resources/default_event_script.sl |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index 2d5503f..f2c7bc1 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -500,7 +500,7 @@ define default_service_event_handler()
 			continue;
 		}
 
-		(d_trans,,,, owner, state) = service_status(services[x], 1);
+		(d_trans,,,,, owner, state) = service_status(services[x], 1);
 		if ((service_state == "started") and (owner < 0) and
 		    (state == "stopped")) {
 			info("Dependency met; starting ", services[x]);
@@ -518,9 +518,12 @@ define default_service_event_handler()
 			% as above is running and the dependent service was
 			% started at or after the service, then stopping it
 			% will result in unwanted service outage.
-			(s_trans,,,, s_state) = service_status(service_name);
+			(s_trans,,,,,, s_state) = service_status(service_name, 1);
 			if ((s_state == "started") and (state == "started") and
 			    (d_trans >= s_trans)) {
+				%debug("S:", service_name, " trans ", s_trans);
+				%debug("D:", services[x], " trans ", d_trans);
+
 				debug("Skipping ", services[x],
 				      "; restart not needed");
 				continue;
-- 
1.7.3.4