Merge remote-tracking branch 'origin/redalert'
Conflicts: app.py
This commit is contained in:
commit
0372013f70
46 changed files with 2432 additions and 432 deletions
6
app.py
6
app.py
|
@ -79,8 +79,14 @@ tf = app.config['DB_TRANSACTION_FACTORY']
|
|||
image_diff_queue = WorkQueue(app.config['DIFFS_QUEUE_NAME'], tf)
|
||||
dockerfile_build_queue = WorkQueue(app.config['DOCKERFILE_BUILD_QUEUE_NAME'], tf,
|
||||
reporter=queue_metrics.report)
|
||||
notification_queue = WorkQueue(app.config['NOTIFICATION_QUEUE_NAME'], tf)
|
||||
|
||||
# TODO: Remove this in the prod push following the notifications change.
|
||||
webhook_queue = WorkQueue(app.config['WEBHOOK_QUEUE_NAME'], tf)
|
||||
|
||||
database.configure(app.config)
|
||||
model.config.app_config = app.config
|
||||
model.config.store = storage
|
||||
|
||||
def get_app_url():
|
||||
return '%s://%s' % (app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME'])
|
||||
|
|
Reference in a new issue