Give a nice error if a VPN key can't be readed (refs #22).

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

diff --git a/pymin/services/vrrp/__init__.py b/pymin/services/vrrp/__init__.py
index adde0b32a355d3d53209911b2c3bb48ed28ebd68..30be5a12e2df86c5e947866f0f53dad219266bc7 100644 (file)
--- a/pymin/services/vrrp/__init__.py
+++ b/pymin/services/vrrp/__init__.py
@@ -4,6 +4,7 @@ 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
@@ -12,7 +13,7 @@ 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.
@@ -25,11 +26,11 @@ class VrrpHandler(Restorable, ParametersHandler, ReloadHandler, RestartHandler,
 
     _restorable_defaults = dict(
         params = dict(
-                ipaddress='192.168.0.1',
-                id = '1',
-                prio = '',
-                dev = 'eth0',
-                persist = True,
+                ipaddress = '192.168.0.1',
+                id        = '1',
+                prio      = '',
+                dev       = 'eth0',
+                persist   = True,
             ),
         )
 
@@ -42,15 +43,24 @@ class VrrpHandler(Restorable, ParametersHandler, ReloadHandler, RestartHandler,
         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
         procman.register('vrrp', None)
@@ -58,7 +68,14 @@ class VrrpHandler(Restorable, ParametersHandler, ReloadHandler, RestartHandler,
 
 
 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()