Permalink
Browse files

Bug 934590: fix branch_urls, RESTAPI_NOTES.txt, and remove memcached …

…support stub; r=catlee
  • Loading branch information...
1 parent fb5cba5 commit f07d9b7bab1648cf014ba24847f2f1c20a78b0ee @djmitche djmitche committed Nov 5, 2013
Showing with 8 additions and 7 deletions.
  1. +1 −1 RESTAPI_NOTES.txt
  2. +6 −3 buildapi/config/deployment.ini_tmpl
  3. +1 −3 buildapi/lib/app_globals.py
View
@@ -41,7 +41,7 @@ the /builds/job_status/{job_id} method.
2) send message to message broker on the 'requests' routing key with
details of job request.
-3) an external agent (such as buildapi/scripts/buildapi-agent.py) receives
+3) an external agent (such as buildapi/scripts/selfserve-agent.py) receives
the message, acts on it, and then sends a message on the 'finished' routing
key to indicate the job was completed.
@@ -52,11 +52,14 @@ carrot.password = buildapi
carrot.exchange = buildapi.control
carrot.consumer.queue = buildapi-web
-# Where the various masters are
+# Link to a JSON file defining the buildmasters
masters_url = http://hg.mozilla.org/build/tools/raw-file/default/buildfarm/maintenance/production-masters.json
-# Which cache to use
-buildapi.cache = redis:
+# Similarly a JSON file defining the branches
+branches_url = http://hg.mozilla.org/build/tools/raw-file/default/buildfarm/maintenance/production-branches.json
+
+# Path to the redis backend cache
+buildapi.cache = redis:HOSTNAME:PORT
# What timezone we're in
timezone = US/Pacific
@@ -30,9 +30,7 @@ def __init__(self, config):
self.branches_url = config['branches_url']
# TODO: handle other hosts/ports
- if cache_spec.startswith('memcached:'):
- self.buildapi_cache = cache.BuildapiCache(cacher.MemcacheCache(), tz)
- elif cache_spec.startswith('redis:'):
+ if cache_spec.startswith('redis:'):
bits = cache_spec.split(':')
kwargs = {}
if len(bits) >= 2:

0 comments on commit f07d9b7

Please sign in to comment.