Merge branch 'procman'

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

diff --git a/pymin/services/vrrp/__init__.py b/pymin/services/vrrp/__init__.py
index 580d4e69a23ec42540e65b6b1345601c3fa76770..f13db3ebf7b29f1b654c9230abc09397b11294ea 100644 (file)
--- a/pymin/services/vrrp/__init__.py
+++ b/pymin/services/vrrp/__init__.py
@@ -1,58 +1,81 @@
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
+import os
 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, ParametersHandler, call
+from pymin.services.util import Restorable, TransactionalHandler, \
+                                ReloadHandler, RestartHandler, \
+                                ServiceHandler, ParametersHandler, call
 
 __ALL__ = ('VrrpHandler',)
 
-class VrrpHandler(Restorable, ParametersHandler, TransactionalHandler):
+# 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):
+
     handler_help = u"Manage VRRP service"
 
-    _persistent_attrs = 'params'
+    _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):
+        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):
+        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='.'):
+        log.debug(u'VrrpHandler(%r, %r, $r)', pickle_dir, config_dir, pid_dir)
         self._persistent_dir = pickle_dir
         self._pid_dir = pid_dir
-        self._restore()
-
-    @handler('Starts the service')
-    def start(self):
-        if self.params['prio'] != '':
-            call(('/usr/local/bin/vrrpd','-i',self.params['dev'],'-v',self.params['id'],'-p',self.params['prio'],self.params['ipaddress']))
-            #print ('vrrpd','-i',self.params['dev'],'-v',self.params['id'],'-p',self.params['prio'],self.params['ipaddress'])
-        else:
-            call(('/usr/local/bin/vrrpd','-i',self.params['dev'],'-v',self.params['id'],self.params['ipaddress']))
-            #print ('vrrpd','-i',self.params['dev'],'-v',self.params['id'],self.params['ipaddress'])
-
-    @handler('Stop the service')
-    def stop(self):
-        try :
-            pid = 'vrrpd' + '_' + self.params['dev'] + '_' + self.params['id'] + '.pid'
-            f = file(path.join(self._pid_dir, pid ), 'r')
-            call(('kill',f.read().strip('\n')))
-            #print('kill','<',f.read())
-        except IOError:
-            pass
-
-    @handler('Reloads the service')
-    def reload(self):
-        self.stop()
-        self.start()
+        procman.register('vrrp', None)
+        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.set('prio','10')
+    v.set('prio', '10')
     v.commit()
+