Add logging to pymin.services.proxy module.

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

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 2aa521db5583335d5fddf5d4b52c1817e96ea96a..1e24cd44656e2ed66cb16268ddd1bd6291c59371 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -1,115 +1,49 @@
 # 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.services.util import Restorable, ConfigWriter, InitdHandler, \
 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \

-                                TransactionalHandler, ParametersHandler
+                                TransactionalHandler, ParametersHandler, \
+                                DictSubHandler

 
 import crypt
 
 
 import crypt
 

-__ALL__ = ('ProxyHandler', 'Error', 'HostError', 'HostAlreadyExistsError',
-            'HostNotFoundError')
+__ALL__ = ('ProxyHandler',)

 
 

-class Error(HandlerError):
-    r"""
-    Error(command) -> Error instance :: Base DnsHandler exception class.
-
-    All exceptions raised by the DnsHandler inherits from this one, so you can
-    easily catch any DnsHandler exception.
-
-    message - A descriptive error message.
-    """
-    pass
-
-class HostError(Error, KeyError):
-    r"""
-    HostError(hostname) -> HostError instance
-
-    This is the base exception for all host related errors.
-    """
-
-    def __init__(self, hostname):
-        r"Initialize the object. See class documentation for more info."
-        self.message = u'Host error: "%s"' % hostname
-
-class HostAlreadyExistsError(HostError):
-    r"""
-    HostAlreadyExistsError(hostname) -> HostAlreadyExistsError instance
-
-    This exception is raised when trying to add a hostname that already exists.
-    """
-
-    def __init__(self, hostname):
-        r"Initialize the object. See class documentation for more info."
-        self.message = u'Host already exists: "%s"' % hostname
-
-class HostNotFoundError(HostError):
-    r"""
-    HostNotFoundError(hostname) -> HostNotFoundError instance
-
-    This exception is raised when trying to operate on a hostname that doesn't
-    exists.
-    """
+class Host(Sequence):
+    def __init__(self,ip):
+        self.ip = ip
+    def as_tuple(self):
+        return (self.ip,)

 
 

-    def __init__(self, hostname):
-        r"Initialize the object. See class documentation for more info."
-        self.message = u'Host not found: "%s"' % hostname
+# TODO convert to a SetSubHandler

 
 

+class HostHandler(DictSubHandler):

 
 

-class Host(Sequence):
+    handler_help = u"Manage proxy hosts"

 
 

-    def __init__(self,ip):
-        self.ip = ip
+    _cont_subhandler_attr = 'hosts'
+    _cont_subhandler_class = Host

 
 

+class User(Sequence):
+    def __init__(self, name, password):
+        self.name = name
+        self.password = crypt.crypt(password,'BA')

     def as_tuple(self):
     def as_tuple(self):

-        return (self.ip)
+        return (self.name, self.password)
+    def update(self, password=None):
+        if password is not None:
+            self.password = crypt.crypt(password,'BA')

 
 

-class HostHandler(Handler):
+class UserHandler(DictSubHandler):

 
 

-    handler_help = u"Manage proxy hosts"
+    handler_help = u"Manage proxy users"

 
 

-    def __init__(self, parent):
-        self.parent = parent
-
-    @handler(u'Adds a host')
-    def add(self, ip):
-        if ip in self.parent.hosts:
-            raise HostAlreadyExistsError(ip)
-        self.parent.hosts[ip] = Host(ip)
-
-    @handler(u'Deletes a host')
-    def delete(self, ip):
-        if not ip in self.parent.hosts:
-            raise HostNotFoundError(ip)
-        del self.parent.hosts[ip]
-
-    @handler(u'Shows all hosts')
-    def list(self):
-        return self.parent.hosts.keys()
-
-    @handler(u'Get information about all hosts')
-    def show(self):
-        return self.parent.hosts.items()
-
-
-class UserHandler(Handler):
-
-    def __init__(self, parent):
-        self.parent = parent
-       
-    @handler('Adds a user')
-    def add(self, user, password):
-        if user in self.parent.users:
-            raise UserAlreadyExistsError(user)
-        self.parent.users[user] = crypt.crypt(password,'BA')
-    
-    @handler('Deletes a user')
-    def delete(self, user):
-        if not user in self.parent.users:
-            raise UserNotFound(user)
-        del self.parent.users[user]
+    _cont_subhandler_attr = 'users'
+    _cont_subhandler_class = User

 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):
 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):


@@ -134,10 +68,11 @@ 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()

-        self._restore()
+        InitdHandler.__init__(self)

         self.host = HostHandler(self)
         self.user = UserHandler(self)
 
         self.host = HostHandler(self)
         self.user = UserHandler(self)
 


@@ -149,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')