Add config to allow for setting the queue names at runtime. Fix a bug in the data model.

This commit is contained in:
jakedt 2014-04-11 19:23:57 -04:00
parent 61a6db236f
commit 4b8217d4ad
4 changed files with 8 additions and 5 deletions

View file

@ -1527,7 +1527,7 @@ def list_logs(start_time, end_time, performer=None, repository=None, namespace=N
joined = joined.where(LogEntry.performer == performer)
if namespace:
joined = joined.where(User.username == namespace_name)
joined = joined.where(User.username == namespace)
return joined.where(
LogEntry.datetime >= start_time,

View file

@ -93,6 +93,6 @@ class WorkQueue(object):
queue_item.save()
image_diff_queue = WorkQueue('imagediff')
dockerfile_build_queue = WorkQueue('dockerfilebuild')
webhook_queue = WorkQueue('webhook')
image_diff_queue = WorkQueue(app.config['DIFFS_QUEUE_NAME'])
dockerfile_build_queue = WorkQueue(app.config['DOCKERFILE_BUILD_QUEUE_NAME'])
webhook_queue = WorkQueue(app.config['WEBHOOK_QUEUE_NAME'])