swarming: read configs from luci-config

appengine/swarming/handlers_frontend.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Main entry point for Swarming service.
 
 This file contains the URL handlers for all the Swarming service URLs,
 implemented using the webapp2 framework.
 """
 
@@ skipping 37 matching lines @@
 
 ### is_admin pages.
 
 # TODO(maruel): Sort the handlers once they got their final name.
 
 
 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):
   """Stores a new bot_config.py script."""
 
   @auth.autologin
   @auth.require(acl.is_admin)
   def get(self):
     bot_config = bot_code.get_bot_config()
     params = {
@@ skipping 718 matching lines @@
   # If running on a local dev server, allow bots to connect without prior
   # groups configuration. Useful when running smoke test.
   if utils.is_local_dev_server():
     acl.bootstrap_dev_server_acls()
 
   # TODO(maruel): Split backend into a separate module. For now add routes here.
   routes.extend(handlers_backend.get_routes())
   routes.extend(handlers_bot.get_routes())
 
   return webapp2.WSGIApplication(routes, debug=debug)