Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

use memcache in docker for zamboni #2756

Merged
merged 2 commits into from Nov 27, 2014
Merged

use memcache in docker for zamboni #2756

merged 2 commits into from Nov 27, 2014

Conversation

andymckay
Copy link
Contributor

@@ -36,7 +36,7 @@ RUN npm install
ENV CLEANCSS_BIN /srv/zamboni-node/node_modules/clean-css/bin/cleancss
ENV ES_HOST elasticsearch:9200
ENV MARKETPLACE_URL http://mp.dev
ENV MEMCACHE_URL memcache:11211
ENV MEMCACHE_URL memcached:11211
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

@muffinresearch
Copy link
Contributor

Is that second commit intended to be part of this PR?

@andymckay
Copy link
Contributor Author

yes, its all part of bug 1089848, but its hard to measure perf when docker isn't using cache machine the same way that prod does

# Here we use the LocMemCache backend from cache-machine, as it interprets the
# "0" timeout parameter of ``cache`` in the same way as the Memcached backend:
# as infinity. Django's LocMemCache backend interprets it as a "0 seconds"
# timeout (and thus doesn't cache at all).

#
# Caching is required for CSRF to work, please do not use the dummy cache.
CACHES = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should move to the else of if os.environ.get('MEMCACHE_URL'):.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure can do

@mstriemer
Copy link
Contributor

Sounds good with the tests. r+ with the settings change.

andymckay pushed a commit that referenced this pull request Nov 27, 2014
use memcache in docker for zamboni
@andymckay andymckay merged commit 938d7f6 into mozilla:master Nov 27, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants