summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-12-06 12:53:14 +0000
committerMarko Kreen2010-12-06 12:53:14 +0000
commitdd9e05f609061de3dde7651b34f7fce95c2ff96c (patch)
tree4b9de72fc3a335a5295048e920aaaef3bac7b8b2
parent09c67533b9db81f5e5e93f69c2db804133b764f0 (diff)
londiste: load bulkloader by default
-rw-r--r--python/londiste/handler.py5
-rw-r--r--python/londiste/handlers/__init__.py3
2 files changed, 6 insertions, 2 deletions
diff --git a/python/londiste/handler.py b/python/londiste/handler.py
index 9cbfa202..265f83af 100644
--- a/python/londiste/handler.py
+++ b/python/londiste/handler.py
@@ -29,7 +29,7 @@ plain londiste:
"""
-import sys, skytools
+import sys, skytools, londiste.handlers
__all__ = ['RowCache', 'BaseHandler', 'parse_handler', 'build_handler', 'load_handlers']
@@ -188,7 +188,8 @@ def parse_handler(tblname, hstr, log):
def load_handlers(cf):
"""Load and register modules from config."""
- lst = cf.getlist('handler_modules', [])
+ lst = londiste.handlers.DEFAULT_HANDLERS
+ lst += cf.getlist('handler_modules', [])
for m in lst:
register_handler_module(m)
diff --git a/python/londiste/handlers/__init__.py b/python/londiste/handlers/__init__.py
index 3efea304..c5de83c6 100644
--- a/python/londiste/handlers/__init__.py
+++ b/python/londiste/handlers/__init__.py
@@ -1 +1,4 @@
# handlers module
+
+DEFAULT_HANDLERS = ['londiste.handlers.bulk']
+