X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/180412078618672ce9966eef6a38b1db8e343c34..7c760d8e7832391621b67cabe629f46e6b5959d1:/pymin/services/dhcp/__init__.py?ds=inline diff --git a/pymin/services/dhcp/__init__.py b/pymin/services/dhcp/__init__.py index 6e6f198..51f7ecb 100644 --- a/pymin/services/dhcp/__init__.py +++ b/pymin/services/dhcp/__init__.py @@ -1,25 +1,15 @@ # vim: set encoding=utf-8 et sw=4 sts=4 : from os import path +import logging ; log = logging.getLogger('pymin.services.dhcp') from pymin.seqtools import Sequence from pymin.dispatcher import Handler, handler, HandlerError from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \ TransactionalHandler, ParametersHandler, \ - DictSubHandler + DictSubHandler, ReloadHandler -__ALL__ = ('DhcpHandler', 'Error') - -class Error(HandlerError): - r""" - Error(message) -> Error instance :: Base DhcpHandler exception class. - - All exceptions raised by the DhcpHandler inherits from this one, so you can - easily catch any DhcpHandler exception. - - message - A descriptive error message. - """ - pass +__ALL__ = ('DhcpHandler',) class Host(Sequence): r"""Host(name, ip, mac) -> Host instance :: Class representing a host. @@ -57,8 +47,8 @@ class HostHandler(DictSubHandler): _cont_subhandler_attr = 'hosts' _cont_subhandler_class = Host -class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler, - ParametersHandler): +class DhcpHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler, + ParametersHandler, InitdHandler): r"""DhcpHandler([pickle_dir[, config_dir]]) -> DhcpHandler instance. Handles DHCP service commands for the dhcpd program. @@ -95,10 +85,11 @@ class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler, def __init__(self, pickle_dir='.', config_dir='.'): r"Initialize DhcpHandler object, see class documentation for details." + log.debug(u'DhcpHandler(%r, %r)', pickle_dir, config_dir) 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) def _get_config_vars(self, config_file): @@ -107,6 +98,12 @@ class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler, if __name__ == '__main__': + logging.basicConfig( + level = logging.DEBUG, + format = '%(asctime)s %(levelname)-8s %(message)s', + datefmt = '%H:%M:%S', + ) + import os h = DhcpHandler()