Merge pull request #2759 from andymckay/1106198

make monitor pass under docker (bug 1106198)

Dockerfile

@@ -37,6 +37,7 @@ 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 memcached:11211
+ENV REDIS_URL redis://redis:6379?socket_timeout=0.5
 ENV SOLITUDE_URL http://solitude:2602
 ENV STYLUS_BIN /srv/zamboni-node/node_modules/stylus/bin/stylus
 ENV UGLIFY_BIN /srv/zamboni-node/node_modules/uglify-js/bin/uglifyjs

mkt/settings.py

@@ -998,7 +998,10 @@ def JINJA_CONFIG():
 REDIRECT_URL = 'http://outgoing.mozilla.org/v1/'
 REDIRECT_SECRET_KEY = ''
 
-REDIS_BACKENDS = {'master': 'redis://localhost:6379?socket_timeout=0.5'}
+REDIS_BACKENDS = {
+    'master': os.environ.get('REDIS_URL',
+                             'redis://localhost:6379?socket_timeout=0.5')
+}
 
 # Allow URLs from these servers. Use full domain names.
 REDIRECT_URL_WHITELIST = ['addons.mozilla.org']

mkt/site/monitors.py

@@ -49,7 +49,11 @@ def memcache():
                 s.close()
 
             memcache_results.append((ip, port, result))
-        if not using_twemproxy and len(memcache_results) < 2:
+        if (not using_twemproxy
+            and len(hosts) > 1
+            and len(memcache_results) < 2):
+            # If the number of requested hosts is greater than 1, but less
+            # than 2 replied, raise an error.
             status = ('2+ memcache servers are required.'
                       '%s available') % len(memcache_results)
             monitor_log.warning(status)

tmp/uploads/collection_icons/.gitkeep

@@ -0,0 +1 @@
+stub file to create an empty dir

tmp/uploads/reviewer_attachment/.gitkeep

@@ -0,0 +1 @@
+stub file to create an empty dir