Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1668)

Unified Diff: appengine/swarming/handlers_frontend.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/handlers_frontend.py
diff --git a/appengine/swarming/handlers_frontend.py b/appengine/swarming/handlers_frontend.py
index 0cab6f04d55c585e55cb5e84a5aa61bf63783f0a..32ef96f57da05180a53495574e9be8dbc85ec6be 100644
--- a/appengine/swarming/handlers_frontend.py
+++ b/appengine/swarming/handlers_frontend.py
@@ -55,48 +55,14 @@ class RestrictedConfigHandler(auth.AuthenticatingHandler):
@auth.autologin
@auth.require(acl.is_admin)
def get(self):
- self.common(None)
-
- @staticmethod
- def cast_to_type(param_name, value):
- def to_bool(value):
- if type(value) is bool:
- return value
- return {'True': True, 'False': False}.get(value, False)
-
- cast = {
- 'bot_death_timeout_secs': int,
- 'enable_ts_monitoring': to_bool,
- 'reusable_task_age_secs': int,
- }.get(param_name, str)
- return cast(value)
-
- @auth.require(acl.is_admin)
- def post(self):
- # Convert MultiDict into a dict.
+ cfg, rev, rev_url = config.settings_info()
params = {
- k: self.cast_to_type(k, self.request.params.getone(k))
- for k in self.request.params
- if k not in ('keyid', 'xsrf_token')
- }
- cfg = config.settings(fresh=True)
- keyid = int(self.request.get('keyid', '0'))
- if cfg.key.integer_id() != keyid:
- self.common('Update conflict %s != %s' % (cfg.key.integer_id(), keyid))
- return
- cfg.populate(**params)
- cfg.store()
- self.common('Settings updated')
-
- def common(self, note):
- params = {
- 'cfg': config.settings(fresh=True),
- 'note': note,
- 'path': self.request.path,
- 'xsrf_token': self.generate_xsrf_token(),
+ 'cfg': cfg,
+ 'rev': rev,
+ 'rev_url': rev_url,
}
self.response.write(
- template.render('swarming/restricted_config.html', params))
+ template.render('swarming/restricted_config.html', params))
class UploadBotConfigHandler(auth.AuthenticatingHandler):

Powered by Google App Engine
This is Rietveld 408576698