diff --git a/pywb/cdx/cdxserver.py b/pywb/cdx/cdxserver.py index e37c4d82..1a68f7e4 100644 --- a/pywb/cdx/cdxserver.py +++ b/pywb/cdx/cdxserver.py @@ -149,10 +149,12 @@ def create_cdx_server(config, ds_rules_file=None): paths = config.get('index_paths') surt_ordered = config.get('surt_ordered', True) perms_checker = config.get('perms_checker') + pass_config = config else: paths = config surt_ordered = True perms_checker = None + pass_config = None logging.debug('CDX Surt-Ordered? ' + str(surt_ordered)) @@ -162,6 +164,7 @@ def create_cdx_server(config, ds_rules_file=None): server_cls = CDXServer return server_cls(paths, + config=pass_config, surt_ordered=surt_ordered, ds_rules=ds_rules_file, perms_checker=perms_checker) diff --git a/pywb/cdx/cdxsource.py b/pywb/cdx/cdxsource.py index 26b1b4cb..783cf36b 100644 --- a/pywb/cdx/cdxsource.py +++ b/pywb/cdx/cdxsource.py @@ -3,8 +3,7 @@ from pywb.utils.loaders import SeekableTextFileReader import urllib import urllib2 -import redis - +import itertools #================================================================= class CDXSource(object): @@ -88,11 +87,13 @@ class RedisCDXSource(CDXSource): DEFAULT_KEY_PREFIX = 'c:' def __init__(self, redis_url, config=None): + import redis self.redis = redis.StrictRedis.from_url(redis_url) - key_prefix = self.DEFAULT_KEY_PREFIX + self.key_prefix = self.DEFAULT_KEY_PREFIX if config: - self.key_prefix = config.get('redis_key_prefix', key_prefix) + self.key_prefix = config.get('redis_key_prefix', self.key_prefix) + def load_cdx(self, params): """