projects
/
matthijs
/
projects
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config: Restructure config loading to allow defaults.
[matthijs/projects/backupninja.git]
/
src
/
lib
/
backupninja
/
handlers
/
__init__.py
diff --git
a/src/lib/backupninja/handlers/__init__.py
b/src/lib/backupninja/handlers/__init__.py
index fb57bf43f01622000622a0c21f71056919bf9c70..ccb5c8c142ec1b8b9fd0dca30df8d71ed7d8b311 100644
(file)
--- a/
src/lib/backupninja/handlers/__init__.py
+++ b/
src/lib/backupninja/handlers/__init__.py
@@
-22,9
+22,14
@@
import sys
import logging as log
import sys
import logging as log
+from backupninja import config
+
class Handler(object):
class Handler(object):
- def __init__(self, conf):
- self.conf = conf
+ def __init__(self):
+ # Subclasses should overwrite this with their default config
+ # See backupninja.config.load_config for the structure of this
+ # value.
+ self.default_config = {}
def run(self, **kwargs):
"""
def run(self, **kwargs):
"""
@@
-40,10
+45,18
@@
class Handler(object):
"""
pass
"""
pass
-def create_handler(ty, conf):
+ def load_config(self, filename):
+ """
+ Load the configuration for this action from the given filename.
+ """
+ self.conf = config.load_config(filename, self.default_config)
+
+
+
+def create_handler(ty):
"""
Create a new (subclass of) Handler object for an action with the
"""
Create a new (subclass of) Handler object for an action with the
- given type.
conf is the configuration to pass to the handler.
+ given type.
If the handler cannot be loaded, an exception is thrown.
"""
If the handler cannot be loaded, an exception is thrown.
"""
@@
-69,7
+82,7
@@
def create_handler(ty, conf):
% (module.__file__))
# Call the "handler" function to create the actual handler
% (module.__file__))
# Call the "handler" function to create the actual handler
- handler = module.handler(
conf
)
+ handler = module.handler()
# Check if the handler returned is really a subclass of Handler
if not isinstance(handler, Handler):
# Check if the handler returned is really a subclass of Handler
if not isinstance(handler, Handler):