rebaseline_server: report proper URL upon launch

gm/rebaseline_server/server.py

 #!/usr/bin/python
 
 """
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 HTTP server for our HTML rebaseline viewer.
 """
 
 # System-level imports
 import argparse
 import BaseHTTPServer
 import json
 import logging
 import os
 import posixpath
 import re
 import shutil
+import socket
 import sys
 import thread
 import time
 import urlparse
 
 # Imports from within Skia
 #
 # We need to add the 'tools' directory, so that we can import svn.py within
 # that directory.
 # Make sure that the 'tools' dir is in the PYTHONPATH, but add it at the *end*
@@ skipping 27 matching lines @@
 
 DEFAULT_ACTUALS_DIR = '.gm-actuals'
 DEFAULT_EXPECTATIONS_DIR = os.path.join(TRUNK_DIRECTORY, 'expectations', 'gm')
 DEFAULT_PORT = 8888
 
 _HTTP_HEADER_CONTENT_LENGTH = 'Content-Length'
 _HTTP_HEADER_CONTENT_TYPE = 'Content-Type'
 
 _SERVER = None   # This gets filled in by main()
 
+def get_routable_ip_address():
+  """Returns routable IP address of this host (the IP address of its network
+     interface that would be used for most traffic, not its localhost
+     interface)."""
+  sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+  sock.connect(('8.8.8.8', 80))

[jcgregorio, 2013/10/29 20:30:49]

Should sock be closed()?

[epoger, 2013/10/29 20:35:04]

Done.

+  return sock.getsockname()[0]
+
+
 class Server(object):
   """ HTTP server for our HTML rebaseline viewer. """
 
   def __init__(self,
                actuals_dir=DEFAULT_ACTUALS_DIR,
                expectations_dir=DEFAULT_EXPECTATIONS_DIR,
                port=DEFAULT_PORT, export=False, editable=True,
                reload_seconds=0):
     """
     Args:
@@ skipping 79 matching lines @@
       time.sleep(self._reload_seconds)
       self.update_results()
 
   def run(self):
     self.results_lock = thread.allocate_lock()
     self.update_results()
     thread.start_new_thread(self._result_reloader, ())
 
     if self._export:
       server_address = ('', self._port)
+      host = get_routable_ip_address()
       if self._editable:
         logging.warning('Running with combination of "export" and "editable" '
                         'flags.  Users on other machines will '
                         'be able to modify your GM expectations!')
     else:
-      server_address = ('127.0.0.1', self._port)
+      host = '127.0.0.1'
+      server_address = (host, self._port)
     http_server = BaseHTTPServer.HTTPServer(server_address, HTTPRequestHandler)
-    logging.info('Ready for requests on http://%s:%d' % (
-        http_server.server_name, http_server.server_port))
+    logging.info('Ready for requests on http://%s:%d' % (host, http_server.server_port))

[epoger, 2013/10/29 20:25:28]

As of patchset 2, it seems to work OK.

Before this CL, on my Mac:

When run without --export:
INFO:root:Ready for requests on http://1.0.0.127.in-addr.arpa:8888

When run with --export:
INFO:root:Ready for requests on
http://epoger-macbookpro2.roam.corp.google.com:8888

(Neither URL actually works, from the same machine!)

------------

After this CL:

When run without --export:
INFO:root:Ready for requests on http://127.0.0.1:8888
(this works)

When run with --export:
INFO:root:Ready for requests on http://172.29.92.44:8888
(that works too)

     http_server.serve_forever()
 
 
 class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
   """ HTTP request handlers for various types of queries this server knows
       how to handle (static HTML and Javascript, expected/actual results, etc.)
   """
   def do_GET(self):
     """ Handles all GET requests, forwarding them to the appropriate
         do_GET_* dispatcher. """
@@ skipping 239 matching lines @@
   args = parser.parse_args()
   global _SERVER
   _SERVER = Server(actuals_dir=args.actuals_dir,
                    expectations_dir=args.expectations_dir,
                    port=args.port, export=args.export, editable=args.editable,
                    reload_seconds=args.reload)
   _SERVER.run()
 
 if __name__ == '__main__':
   main()