Chromium Code Reviews| Index: appengine/swarming/handlers_endpoints.py |
| diff --git a/appengine/swarming/handlers_endpoints.py b/appengine/swarming/handlers_endpoints.py |
| index 14bffea97035efe1e79a5829c7adbe8ff8301e71..ac551d4484ad6092d96582f4c2d36b66bb9c70cb 100644 |
| --- a/appengine/swarming/handlers_endpoints.py |
| +++ b/appengine/swarming/handlers_endpoints.py |
| @@ -6,6 +6,7 @@ |
| import datetime |
| import logging |
| +import os |
| from google.appengine.api import datastore_errors |
| from google.appengine.ext import ndb |
| @@ -133,7 +134,22 @@ class SwarmingServerService(remote.Service): |
| @auth.require(acl.is_bot_or_user) |
| def details(self, _request): |
| """Returns information about the server.""" |
| - return swarming_rpcs.ServerDetails(server_version=utils.get_app_version()) |
| + host = 'https://' + os.environ['HTTP_HOST'] |
| + return swarming_rpcs.ServerDetails( |
| + bot_version = bot_code.get_bot_version(host), |
| + server_version = utils.get_app_version() |
| + ) |
|
M-A Ruel
2016/09/26 16:36:15
FTR, I'm really not a fan of terminating ) on a ne
kjlubick
2016/09/26 16:50:38
Fixed.
|
| + |
| + @gae_ts_mon.instrument_endpoint() |
| + @auth.endpoints_method( |
| + message_types.VoidMessage, swarming_rpcs.BootstrapToken, |
| + http_method='GET') |
|
M-A Ruel
2016/09/26 16:36:15
I think this should be a POST, since it's generati
kjlubick
2016/09/26 16:50:38
Done.
|
| + @auth.require(acl.is_bootstrapper) |
| + def token(self, _request): |
| + """Returns a token to bootstrap a new bot.""" |
| + return swarming_rpcs.BootstrapToken( |
| + bootstrap_token = bot_code.generate_bootstrap_token(), |
| + ) |
| @gae_ts_mon.instrument_endpoint() |
| @auth.endpoints_method( |