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

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

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index a02e6c58df2e7c69a8d8508f2029c84c23f461c6..5ab624beba4737f26ec3efbd664c6b07505aa989 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -1,6 +1,7 @@
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
 from os import path
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
 from os import path

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

 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError


@@ -10,7 +11,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
 
 import crypt
 
 
 import crypt
 

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

 
 class Host(Sequence):
     def __init__(self,ip):
 
 class Host(Sequence):
     def __init__(self,ip):


@@ -67,6 +68,7 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
 
     def __init__(self, pickle_dir='.', config_dir='.'):
         r"Initialize DhcpHandler object, see class documentation for details."
 
     def __init__(self, pickle_dir='.', config_dir='.'):
         r"Initialize DhcpHandler object, see class documentation for details."

+        log.debug(u'ProxyHandler(%r, %r)', pickle_dir, config_dir)

         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()


@@ -82,6 +84,12 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':
 

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

     px = ProxyHandler()
     px.set('ip','192.66.66.66')
     px.set('port','666')
     px = ProxyHandler()
     px.set('ip','192.66.66.66')
     px.set('port','666')