fix outrageous latency precision in web-page, also report server-policy via JSON...

diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index 032c6d40d525c3d01c56c3996dd068c7cf9b1615..e224fe46e4549a09c0f415432f0dce761d3014c5 100644 (file)
--- a/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@ -83,7 +83,8 @@ static void connectionThread(int sock, ComboAddress remote, string password)
        { "packetcache-hits", 0},
        { "packetcache-misses", 0},
        { "over-capacity-drops", 0 },
-       { "too-old-drops", 0 }
+       { "too-old-drops", 0 },
+       { "server-policy", g_policy.getLocal()->name}
       };
 
       for(const auto& e : g_stats.entries) {

diff --git a/pdns/dnsdistdist/html/index.html b/pdns/dnsdistdist/html/index.html
index 82530da3f4e3f7933cbb1c20e0e12404ae906c36..9c27b990d925500042de1f0f57703d6995ed0305 100644 (file)
--- a/pdns/dnsdistdist/html/index.html
+++ b/pdns/dnsdistdist/html/index.html
@@ -51,7 +51,7 @@ alt="Fork me on GitHub"></a>
 </tr></table>
 <p>
 Version: <span id="version"></span>, uptime: <span id="uptime"></span>, Number of queries: <span id="questions"></span> (<span id="qps"></span> qps)<br/>
-Average response time: <span id="latency"></span> ms, CPU Usage: <span id="cpu"></span>% <br/>
+Average response time: <span id="latency"></span> ms, CPU Usage: <span id="cpu"></span>%, Server selection policy: <span id="server-policy"></span> <br/>
 </p>
 <table width="100%" cellpadding="20">
   <tr valign="top">

diff --git a/pdns/dnsdistdist/html/local.js b/pdns/dnsdistdist/html/local.js
index 8ac365135329f77b0f2d97cd3ebf9c20fc1a9519..1e9225b2c3ca0e83b93dd0f7045e4331bd307066 100644 (file)
--- a/pdns/dnsdistdist/html/local.js
+++ b/pdns/dnsdistdist/html/local.js
@@ -152,7 +152,7 @@ $(document).ready(function() {
                $("#over-capacity-drops").text(data["over-capacity-drops"]);
                $("#too-old").text(data["too-old-drops"]);
                $("#uptime").text(moment.duration(data["uptime"]*1000.0).humanize());
-               $("#latency").text(data["latency-avg100"]/1000.0);
+               $("#latency").text((data["latency-avg100"]/1000.0).toFixed(2));
                if(!gdata["cpu-sys-msec"]) 
                    gdata=data;
 
@@ -161,6 +161,7 @@ $(document).ready(function() {
                $("#cpu").text(cpu.toFixed(2));
                var qps=1.0*data["queries"]-1.0*gdata["queries"];
                $("#qps").text(qps);
+               $("#server-policy").text(data["server-policy"]);
 
                var servfailps=1.0*data["servfail-responses"]-1.0*gdata["servfail-responses"];