appengine/swarming/main.py - Issue 1926443003: swarming: read configs from luci-config

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: appengine/swarming/main.py

Issue 1926443003: swarming: read configs from luci-config (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master

Patch Set: unlint Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: appengine/swarming/main.py

diff --git a/appengine/swarming/main.py b/appengine/swarming/main.py

index 7ed3dfe0a97a71db113bb59e50931a4beff99177..a3db92d6d359f7e6cf41dffff89fb9c3a4c1ccf9 100644

--- a/appengine/swarming/main.py

+++ b/appengine/swarming/main.py

@@ -38,8 +38,13 @@ def create_application():

# Local import, because it instantiates the mapreduce app.

from mapreduce import main

gae_ts_mon.initialize(main.APP, is_enabled_fn=is_enabled_callback)

- # App that serves new endpoints API.

- api = endpoints.api_server([handlers_endpoints.swarming_api])

+ api = endpoints.api_server([

+ # App that serves new endpoints API.

M-A Ruel 2016/04/27 17:50:45 Remove this comment, it was stale.

nodir 2016/04/27 18:37:21 Done.

+ handlers_endpoints.swarming_api,

+ # components.config endpoints for validation and configuring of luci-config

+ # service URL.

+ config.ConfigApi,

+ ])

ts_mon_metrics.initialize()

return frontend_app, api, main.APP

« no previous file with comments | « appengine/swarming/handlers_test.py ('k') | appengine/swarming/proto/Makefile » ('j') | appengine/swarming/server/config.py » ('J')