From 424d355b48b7dccdb345f1f9ff7afe506e4388c8 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 19 Mar 2010 03:04:05 +0000 Subject: Upstart: Properly verify service status Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5781 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/Upstart.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/lib/Client/Tools/Upstart.py') diff --git a/src/lib/Client/Tools/Upstart.py b/src/lib/Client/Tools/Upstart.py index a3da5b514..43a51fd79 100644 --- a/src/lib/Client/Tools/Upstart.py +++ b/src/lib/Client/Tools/Upstart.py @@ -32,13 +32,17 @@ class Upstart(Bcfg2.Client.Tools.SvcTool): output = self.cmd.run('/usr/sbin/service %s status' % \ entry.get('name'))[1][0] if output.split(' ')[1].split('/')[1].startswith('running'): - status = True + entry.set('current_status', 'on') if entry.get('status') == 'off': - entry.set('current_status', 'on') + status = False + else: + status = True else: - status = False + entry.set('current_status', 'off') if entry.get('status') == 'on': - entry.set('current_status', 'off') + status = False + else: + status = True return status -- cgit v1.2.3-1-g7c22