backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

fix missing param, typo

Browse Source
This commit is contained in:
Ilya Kreymer 2014-02-24 19:42:37 +00:00
parent ef062fee7b
commit a474335501
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pywb/cdx/cdxserver.py
View File

@ -149,10 +149,12 @@ def create_cdx_server(config, ds_rules_file=None):
paths = config.get('index_paths') paths = config.get('index_paths')
surt_ordered = config.get('surt_ordered', True) surt_ordered = config.get('surt_ordered', True)
perms_checker = config.get('perms_checker') perms_checker = config.get('perms_checker')
pass_config = config
else: else:
paths = config paths = config
surt_ordered = True surt_ordered = True
perms_checker = None perms_checker = None
pass_config = None
logging.debug('CDX Surt-Ordered? ' + str(surt_ordered)) logging.debug('CDX Surt-Ordered? ' + str(surt_ordered))
@ -162,6 +164,7 @@ def create_cdx_server(config, ds_rules_file=None):
server_cls = CDXServer server_cls = CDXServer
return server_cls(paths, return server_cls(paths,
config=pass_config,
surt_ordered=surt_ordered, surt_ordered=surt_ordered,
ds_rules=ds_rules_file, ds_rules=ds_rules_file,
perms_checker=perms_checker) perms_checker=perms_checker)

9
pywb/cdx/cdxsource.py
View File

@ -3,8 +3,7 @@ from pywb.utils.loaders import SeekableTextFileReader
import urllib import urllib
import urllib2 import urllib2
import redis import itertools
#================================================================= #=================================================================
class CDXSource(object): class CDXSource(object):
@ -88,11 +87,13 @@ class RedisCDXSource(CDXSource):
DEFAULT_KEY_PREFIX = 'c:' DEFAULT_KEY_PREFIX = 'c:'
def __init__(self, redis_url, config=None): def __init__(self, redis_url, config=None):
import redis
self.redis = redis.StrictRedis.from_url(redis_url) self.redis = redis.StrictRedis.from_url(redis_url)
key_prefix = self.DEFAULT_KEY_PREFIX self.key_prefix = self.DEFAULT_KEY_PREFIX
if config: 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): def load_cdx(self, params):
""" """