Add links to MP and resolve minor fixes

appengine/swarming/handlers_endpoints.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """This module defines Swarming Server endpoints handlers."""
 
 import datetime
 import logging
 import os
 
@@ skipping 117 matching lines @@
 @swarming_api.api_class(resource_name='server', path='server')
 class SwarmingServerService(remote.Service):
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       message_types.VoidMessage, swarming_rpcs.ServerDetails,
       http_method='GET')
   @auth.require(acl.is_bot_or_user)
   def details(self, _request):
     """Returns information about the server."""
     host = 'https://' + os.environ['HTTP_HOST']
+
+    mpp = ""

[M-A Ruel, 2016/10/11 16:26:55]

Use single quotes.

[kjlubick, 2016/10/11 17:00:02]

Done.

+    logging.info("Settings: %s",config.settings())

[M-A Ruel, 2016/10/11 16:26:55]

you should log the returned object if you want to return anything.

[kjlubick, 2016/10/11 17:00:02]

Oops, left over logging. Removed.

+    if config.settings().mp and config.settings().mp.server:
+      mpp = config.settings().mp.server
+
     return swarming_rpcs.ServerDetails(
         bot_version = bot_code.get_bot_version(host),
-        server_version = utils.get_app_version())
+        server_version = utils.get_app_version(),
+        machine_provider_prefix = mpp,
+        milo_prefix = config.settings().milo_server_prefix,
+        sk_revision_prefix = config.settings().sk_revision_prefix)
 
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       message_types.VoidMessage, swarming_rpcs.BootstrapToken)
   @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(),
       )
@@ skipping 578 matching lines @@
 def get_routes():
   return (
     endpoints_webapp2.api_routes(SwarmingServerService) +
     endpoints_webapp2.api_routes(SwarmingTaskService) +
     endpoints_webapp2.api_routes(SwarmingTasksService) +
     endpoints_webapp2.api_routes(SwarmingBotService) +
     endpoints_webapp2.api_routes(SwarmingBotsService) +
     # components.config endpoints for validation and configuring of luci-config
     # service URL.
     endpoints_webapp2.api_routes(config.ConfigApi))