From 086ff1838634a6b1358234d5c9ba9db295901828 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 24 Feb 2011 10:43:54 -0500 Subject: Service: Allow services that are both supervised and custom (Ticket #979) --- src/lib/Client/Tools/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/Client/Tools/__init__.py') diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py index 8a90e130c..b5120db71 100644 --- a/src/lib/Client/Tools/__init__.py +++ b/src/lib/Client/Tools/__init__.py @@ -335,9 +335,7 @@ class SvcTool(Tool): def restart_service(self, service): self.logger.debug('Restarting service %s' % service.get('name')) - restart_target = 'restart' - if service.get('mode', 'default') == 'custom': - restart_target = service.get('target', 'restart') + restart_target = service.get('target', 'restart') return self.cmd.run(self.get_svc_command(service, restart_target))[0] def check_service(self, service): @@ -353,7 +351,7 @@ class SvcTool(Tool): if entry.get('mode', 'default') == 'manual': continue # need to handle servicemode = (build|default) - # need to handle mode = (default|supervised|custom) + # need to handle mode = (default|supervised) if entry.get('status') == 'on': if self.setup['servicemode'] == 'build': rc = self.stop_service(entry) -- cgit v1.2.3-1-g7c22