Launchpad itself

Merge lp:~cjwatson/launchpad/fix-memcache-error-message into lp:launchpad

  1. fix-memcache-error-message
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18473
Proposed branch: lp:~cjwatson/launchpad/fix-memcache-error-message
Merge into: lp:launchpad
Diff against target: 16 lines (+2/-2)
1 file modified
lib/lp/services/memcache/client.py (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpad/fix-memcache-error-message
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+331417@code.launchpad.net

Commit message

Fix memcache_client_factory error case. config.memcache.addresses isn't a thing.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/memcache/client.py'
2--- lib/lp/services/memcache/client.py 2012-01-01 02:58:52 +0000
3+++ lib/lp/services/memcache/client.py 2017-09-27 11:21:23 +0000
4@@ -1,4 +1,4 @@
5-# Copyright 2009 Canonical Ltd. This software is licensed under the
6+# Copyright 2009-2017 Canonical Ltd. This software is licensed under the
7 # GNU Affero General Public License version 3 (see the file LICENSE).
8
9 """Launchpad Memcache client."""
10@@ -23,7 +23,7 @@
11 (host, int(weight)) for host, weight in re.findall(
12 r'\((.+?),(\d+)\)', config.memcache.servers)]
13 assert len(servers) > 0, "Invalid memcached server list %r" % (
14- config.memcache.addresses,)
15+ config.memcache.servers,)
16 return TimelineRecordingClient(servers)
17
18