X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/db8c5b1ab9ca142eaf27f7cf425759ca78dbdc65..35e83d5d9147c1ec600525e21da37ba930a61e2a:/cookbooks/tile/templates/default/debug.erb?ds=sidebyside
diff --git a/cookbooks/tile/templates/default/debug.erb b/cookbooks/tile/templates/default/debug.erb
index dbbf91d38..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
@@ -70,7 +79,7 @@ node[:tile][:data].each do |name,data|
file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}"
file_basename = File.basename(url)
-%>
-print "%s last modified: %s" % (<%= file_basename %>, time.ctime(os.path.getmtime(<%= file %>)))
+print "%s last modified: %s
" % ("<%= file_basename %>", time.ctime(os.path.getmtime("<%= file %>")))
<%
end
-%>