diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-02-24 10:43:54 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-02-24 10:43:54 -0500 |
| commit | 086ff1838634a6b1358234d5c9ba9db295901828 (patch) | |
| tree | 497fbad82f6d9ed92ba90744a2fc66c7cafe55d6 /src | |
| parent | dfbd50f2dedf33b2369fc0d6f3d11a4f06b7c862 (diff) | |
| download | bcfg2-086ff1838634a6b1358234d5c9ba9db295901828.tar.gz bcfg2-086ff1838634a6b1358234d5c9ba9db295901828.tar.bz2 bcfg2-086ff1838634a6b1358234d5c9ba9db295901828.zip | |
Service: Allow services that are both supervised and custom (Ticket #979)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Client/Tools/__init__.py | 6 |
1 files changed, 2 insertions, 4 deletions
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) |