removed MemcacheStub in InternalProxy to allow memcache usage based on config

This commit is contained in:
John Dickinson 2012-05-21 14:14:49 -05:00
parent ac9a322f22
commit 6f3b21e918
2 changed files with 2 additions and 25 deletions

View File

@ -91,7 +91,7 @@ class AccessLogDelivery(LogProcessorCommon):
def get_logs_to_process(self, already_processed_files):
lookback_start, lookback_end = self.calculate_lookback()
logs_to_process = self.log_processor.get_container_listing(
logs_to_process = self.get_container_listing(
self.source_account,
self.source_container,
lookback_start,

View File

@ -22,27 +22,6 @@ from slogging.compressing_file_reader import CompressingFileReader
from swift.proxy.server import BaseApplication
class MemcacheStub(object):
def get(self, *a, **kw): # pragma: no cover
return None
def set(self, *a, **kw): # pragma: no cover
return None
def incr(self, *a, **kw): # pragma: no cover
return 0
def delete(self, *a, **kw): # pragma: no cover
return None
def set_multi(self, *a, **kw): # pragma: no cover
return None
def get_multi(self, *a, **kw): # pragma: no cover
return []
def make_request_body_file(source_file, compress=True):
if hasattr(source_file, 'seek'):
source_file.seek(0)
@ -75,9 +54,7 @@ class InternalProxy(object):
"""
def __init__(self, proxy_server_conf=None, logger=None, retries=0):
self.upload_app = BaseApplication(proxy_server_conf,
memcache=MemcacheStub(),
logger=logger)
self.upload_app = BaseApplication(proxy_server_conf, logger=logger)
self.retries = retries
def _handle_request(self, req, source_file=None, compress=True):