Bugfix: replace __ALL__ with the correct __all__.

[software/pymin.git] / pymin / services / vrrp / __init__.py

diff --git a/pymin/services/vrrp/__init__.py b/pymin/services/vrrp/__init__.py
index 403cd364fdac153229282e8fb6230cc921680eb3..30be5a12e2df86c5e947866f0f53dad219266bc7 100644 (file)
--- a/pymin/services/vrrp/__init__.py
+++ b/pymin/services/vrrp/__init__.py
@@ -4,15 +4,19 @@ import os
 from os import path
 from signal import SIGTERM
 from subprocess import Popen, PIPE
 from os import path
 from signal import SIGTERM
 from subprocess import Popen, PIPE

+import logging ; log = logging.getLogger('pymin.services.vrrp')

 
 

+from pymin import procman

 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, TransactionalHandler, \
                                 ReloadHandler, RestartHandler, \
                                 ServiceHandler, ParametersHandler, call
 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, TransactionalHandler, \
                                 ReloadHandler, RestartHandler, \
                                 ServiceHandler, ParametersHandler, call
 

-__ALL__ = ('VrrpHandler',)
+__all__ = ('VrrpHandler',)

 
 

+# FIXME the the command should not use new parameters unless commit where called
+#       i.e. integrate commit with procman to update internal procman parameters.

 class VrrpHandler(Restorable, ParametersHandler, ReloadHandler, RestartHandler,
                         ServiceHandler, TransactionalHandler):
 
 class VrrpHandler(Restorable, ParametersHandler, ReloadHandler, RestartHandler,
                         ServiceHandler, TransactionalHandler):
 


@@ -21,38 +25,57 @@ class VrrpHandler(Restorable, ParametersHandler, ReloadHandler, RestartHandler,
     _persistent_attrs = ['params']
 
     _restorable_defaults = dict(
     _persistent_attrs = ['params']
 
     _restorable_defaults = dict(

-                            params = dict( ipaddress='192.168.0.1',
-                                            id = '1',
-                                            prio = '',
-                                            dev = 'eth0',
-                                    ),
-                            )
+        params = dict(
+                ipaddress = '192.168.0.1',
+                id        = '1',
+                prio      = '',
+                dev       = 'eth0',
+                persist   = True,
+            ),
+        )
+
+    @property
+    def _command(self):
+        command = ['vrrpd', '-i', self.params['dev'], '-v', self.params['id']]
+        if self.params['prio']:
+            command.extend(('-p', self.params['prio']))
+        command.append(self.params['ipaddress'])
+        return command

 
     def _service_start(self):
 
     def _service_start(self):

-        if self.params['prio'] != '':
-            call(('vrrp', '-i', self.params['dev'], '-v', self.params['id'],
-                    '-p', self.params['prio'], self.params['ipaddress']))
-        else:
-            call(('vrrp', '-i', self.params['dev'], '-v', self.params['id'], \
-                    self.params['ipaddress']))
+        log.debug(u'VrrpHandler._service_start()')
+        procinfo = procman.get('vrrp')
+        procinfo.command = self._command
+        procinfo.persist = self.params['persist']
+        procman.start('vrrp')

 
     def _service_stop(self):
 
     def _service_stop(self):

-        try:
-            pid_filename = 'vrrpd_%(dev)s_%(id)s.pid' % self.params
-            pid = file(path.join(self._pid_dir, pid_filename )).read().strip()
-            os.kill(int(pid), SIGTERM)
-        except (IOError, OSError):
-            # TODO log
-            pass
+        log.debug(u'VrrpHandler._service_stop()')
+        procman.stop('vrrp')
+
+    def _service_restart(self):
+        procinfo = procman.get('vrrp')
+        procinfo.command = self._command
+        procinfo.persist = self.params['persist']
+        procman.restart('vrrp')

 
     def __init__(self, pickle_dir='.', config_dir='.', pid_dir='.'):
 
     def __init__(self, pickle_dir='.', config_dir='.', pid_dir='.'):

+        log.debug(u'VrrpHandler(%r, %r, $r)', pickle_dir, config_dir, pid_dir)

         self._persistent_dir = pickle_dir
         self._pid_dir = pid_dir
         self._persistent_dir = pickle_dir
         self._pid_dir = pid_dir

+        procman.register('vrrp', None)

         ServiceHandler.__init__(self)
 
 
 if __name__ == '__main__':
         ServiceHandler.__init__(self)
 
 
 if __name__ == '__main__':

+
+    logging.basicConfig(
+        level   = logging.DEBUG,
+        format  = '%(asctime)s %(levelname)-8s %(message)s',
+        datefmt = '%H:%M:%S',
+    )
+

     v = VrrpHandler()
     v = VrrpHandler()

-    v.set('prio','10')
+    v.set('prio', '10')

     v.commit()
 
     v.commit()