rebaseline_server: report proper URL upon launch

gm/rebaseline_server/server.py

Index: gm/rebaseline_server/server.py
===================================================================
--- gm/rebaseline_server/server.py	(revision 12004)
+++ gm/rebaseline_server/server.py	(working copy)
@@ -18,6 +18,7 @@
 import posixpath
 import re
 import shutil
+import socket
 import sys
 import thread
 import time
@@ -65,6 +66,15 @@
 
 _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. """
 
@@ -164,15 +174,16 @@
 
     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()