Add runtime check for providers if all dependencies are met

[ddns.git] / src / ddns / __init__.py

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index d14097dbcb9cf97be66162352765cf73061ab1b6..7f2729c2c8c0cc93e09e46ec343fce6804664276 100644 (file)
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@ -28,7 +28,10 @@ from i18n import _
 logger = logging.getLogger("ddns.core")
 logger.propagate = 1
 
-from .providers import *
+import database
+import providers
+
+from .errors import *
 from .system import DDNSSystem
 
 # Setup the logger.
@@ -40,6 +43,8 @@ def setup_logging():
        handler = logging.handlers.SysLogHandler(address="/dev/log",
                facility=logging.handlers.SysLogHandler.LOG_DAEMON
        )
+       formatter = logging.Formatter("ddns[%(process)d]: %(message)s")
+       handler.setFormatter(formatter)
        handler.setLevel(logging.INFO)
        rootlogger.addHandler(handler)
 
@@ -61,8 +66,10 @@ class DDNSCore(object):
                self.settings = {}
 
                # Dict with all providers, that are supported.
-               self.providers = {}
-               self.register_all_providers()
+               self.providers = providers.get()
+
+               for handle, provider in sorted(self.providers.items()):
+                       logger.debug("Registered new provider: %s (%s)" % (provider.name, provider.handle))
 
                # List of configuration entries.
                self.entries = []
@@ -70,48 +77,8 @@ class DDNSCore(object):
                # Add the system class.
                self.system = DDNSSystem(self)
 
-       def register_provider(self, provider):
-               """
-                       Registers a new provider.
-               """
-               assert issubclass(provider, DDNSProvider)
-
-               if not all((provider.handle, provider.name, provider.website)):
-                       raise DDNSError(_("Provider is not properly configured"))
-
-               assert not self.providers.has_key(provider.handle), \
-                       "Provider '%s' has already been registered" % provider.handle
-
-               logger.debug("Registered new provider: %s (%s)" % (provider.name, provider.handle))
-               self.providers[provider.handle] = provider
-
-       def register_all_providers(self):
-               """
-                       Simply registers all providers.
-               """
-               for provider in (
-                       DDNSProviderAllInkl,
-                       DDNSProviderDHS,
-                       DDNSProviderDNSpark,
-                       DDNSProviderDtDNS,
-                       DDNSProviderDynDNS,
-                       DDNSProviderDynU,
-                       DDNSProviderEasyDNS,
-                       DDNSProviderFreeDNSAfraidOrg,
-                       DDNSProviderNamecheap,
-                       DDNSProviderNOIP,
-                       DDNSProviderLightningWireLabs,
-                       DDNSProviderOVH,
-                       DDNSProviderRegfish,
-                       DDNSProviderSelfhost,
-                       DDNSProviderSPDNS,
-                       DDNSProviderStrato,
-                       DDNSProviderTwoDNS,
-                       DDNSProviderUdmedia,
-                       DDNSProviderVariomedia,
-                       DDNSProviderZoneedit,
-               ):
-                       self.register_provider(provider)
+               # Open the database.
+               self.db = database.DDNSDatabase(self, "/var/lib/ddns.db")
 
        def get_provider_names(self):
                """
@@ -122,12 +89,17 @@ class DDNSCore(object):
        def load_configuration(self, filename):
                logger.debug(_("Loading configuration file %s") % filename)
 
-               configs = ConfigParser.SafeConfigParser()
+               configs = ConfigParser.RawConfigParser()
                configs.read([filename,])
 
                # First apply all global configuration settings.
-               for k, v in configs.items("config"):
-                       self.settings[k] = v
+               try:
+                       for k, v in configs.items("config"):
+                               self.settings[k] = v
+
+               # Allow missing config section
+               except ConfigParser.NoSectionError:
+                       pass
 
                for entry in configs.sections():
                        # Skip the special config section.
@@ -152,6 +124,12 @@ class DDNSCore(object):
                                logger.warning("Could not find provider '%s' for entry '%s'." % (provider, entry))
                                continue
 
+                       # Check if the provider is actually supported and if there are
+                       # some dependencies missing on this system.
+                       if not provider.supported():
+                               logger.warning("Provider '%s' is known, but not supported on this machine" % (provider.name))
+                               continue
+
                        # Create an instance of the provider object with settings from the
                        # configuration file.
                        entry = provider(self, **settings)
@@ -195,7 +173,3 @@ class DDNSCore(object):
                except Exception, e:
                        logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) throwed an unhandled exception:") % \
                                { "hostname" : entry.hostname, "provider" : entry.name }, exc_info=True)
-
-               else:
-                       logger.info(_("Dynamic DNS update for %(hostname)s (%(provider)s) successful") % \
-                               { "hostname" : entry.hostname, "provider" : entry.name })