From 154c97c06501ef66e0a103644731ed53d1096fc3 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 23 Jan 2009 02:57:34 +0000 Subject: Simplify service configuration; make all services use common restart framework git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5040 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/DebInit.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/lib/Client/Tools/DebInit.py') diff --git a/src/lib/Client/Tools/DebInit.py b/src/lib/Client/Tools/DebInit.py index b18c11cd5..cd5b7c784 100644 --- a/src/lib/Client/Tools/DebInit.py +++ b/src/lib/Client/Tools/DebInit.py @@ -7,10 +7,9 @@ import Bcfg2.Client.Tools class DebInit(Bcfg2.Client.Tools.SvcTool): '''Debian Service Support for Bcfg2''' name = 'DebInit' - __execs__ = ['/usr/sbin/update-rc.d'] + __execs__ = ['/usr/sbin/update-rc.d', '/usr/sbin/invoke-rc.d'] __handles__ = [('Service', 'deb')] __req__ = {'Service': ['name', 'status']} - __svcrestart__ = 'restart' svcre = re.compile("/etc/.*/(?P[SK])(?P\d+)(?P\S+)") # implement entry (Verify|Install) ops @@ -94,18 +93,5 @@ class DebInit(Bcfg2.Client.Tools.SvcTool): # Extra services need to be reflected in the config return - def BundleUpdated(self, bundle, states): - '''The Bundle has been updated''' - for entry in bundle: - if self.handlesEntry(entry): - command = "/usr/sbin/invoke-rc.d %s" % entry.get('name') - if entry.get('status') == 'on' and not self.setup['build']: - self.logger.debug('Restarting service %s' % entry.get('name')) - rc = self.cmd.run('%s %s' % (command, \ - entry.get('reload', self.__svcrestart__)))[0] - else: - self.logger.debug('Stopping service %s' % entry.get('name')) - rc = self.cmd.run('%s stop' % command)[0] - if rc: - self.logger.error("Failed to restart service %s" % (entry.get('name'))) - + def get_svc_command(self, service, action): + return '/usr/sbin/invoke-rc.d %s %s' % (service.get('name'), action) -- cgit v1.2.3-1-g7c22