From: Tom Hughes Date: Mon, 27 Jan 2014 21:28:36 +0000 (+0000) Subject: Display cache server name in tile server debug output X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/96c2c1135c7ca32771a816a0fa5b6fd169e9851b Display cache server name in tile server debug output --- diff --git a/cookbooks/tile/templates/default/debug.erb b/cookbooks/tile/templates/default/debug.erb index 3da30dfeb..03af6549f 100755 --- a/cookbooks/tile/templates/default/debug.erb +++ b/cookbooks/tile/templates/default/debug.erb @@ -4,6 +4,7 @@ import cgi import cgitb import os +import re import sys import resource import time @@ -48,6 +49,12 @@ def output_error(message): if not os.environ.has_key('HTTP_USER_AGENT'): os.environ['HTTP_USER_AGENT'] = 'NONE' +# Get the cache server name +if os.environ.has_key('HTTP_VIA'): + cache_server = re.search('[a-z0-9-]+\.openstreetmap\.org', os.environ['HTTP_VIA']).group(0) +else: + cache_server = None + # Get the load average loadavg = float(open("/proc/loadavg").readline().split(" ")[0]) @@ -59,6 +66,8 @@ print "" print "" print "

tile.openstreetmap.org debug

" print "

Server Stats

" +if cache_server: + print "

Cache Server: %s

" % cache_server print "

" print "Render Server: <%= node['fqdn'] %>
" print "Load Average: %s

" % loadavg