diff options
| author | Tim Burke <tim.burke@gmail.com> | 2020-06-18 09:41:46 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2020-06-18 09:41:46 -0700 |
| commit | 481f126e6b59689599f438e5d27f7328f5b3e813 (patch) | |
| tree | 14212db13aee782e95ffd36993d74c6bf35df0cb /swift/common/middleware/memcache.py | |
| parent | b3fd0bd9d82160305a821e742b2cd968036911b2 (diff) | |
| parent | 51a587ed8dd5700b558ad26d70dcb7facc0f91e4 (diff) | |
| download | swift-481f126e6b59689599f438e5d27f7328f5b3e813.tar.gz | |
Merge remote-tracking branch 'gerrit/master' into feature/losffeature/losf
Change-Id: If9d7c63f3c4c15fbccff31e2b77a6911bb95972a
Diffstat (limited to 'swift/common/middleware/memcache.py')
| -rw-r--r-- | swift/common/middleware/memcache.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/swift/common/middleware/memcache.py b/swift/common/middleware/memcache.py index e846749cb..b5b9569a5 100644 --- a/swift/common/middleware/memcache.py +++ b/swift/common/middleware/memcache.py @@ -19,6 +19,7 @@ from six.moves.configparser import ConfigParser, NoSectionError, NoOptionError from swift.common.memcached import (MemcacheRing, CONN_TIMEOUT, POOL_TIMEOUT, IO_TIMEOUT, TRY_COUNT) +from swift.common.utils import get_logger class MemcacheMiddleware(object): @@ -28,6 +29,7 @@ class MemcacheMiddleware(object): def __init__(self, app, conf): self.app = app + self.logger = get_logger(conf, log_route='memcache') self.memcache_servers = conf.get('memcache_servers') serialization_format = conf.get('memcache_serialization_support') try: @@ -102,7 +104,8 @@ class MemcacheMiddleware(object): io_timeout=io_timeout, allow_pickle=(serialization_format == 0), allow_unpickle=(serialization_format <= 1), - max_conns=max_conns) + max_conns=max_conns, + logger=self.logger) def __call__(self, env, start_response): env['swift.cache'] = self.memcache |