Convert ws-auth to produce numerical stats.

PowerDNS · Jan 16, 2017 · dd539ca · dd539ca
1 parent c5414ea
commit dd539ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
@@ -195,11 +195,11 @@ void apiServerStatistics(HttpRequest* req, HttpResponse* resp) {
   if(req->method != "GET")
     throw HttpMethodNotAllowedException();
 
-  map<string,string> items;
+  map<string,int> items;
   productServerStatisticsFetch(items);
 
   Json::array doc;
-  typedef map<string, string> items_t;
+  typedef map<string, int> items_t;
   for(const items_t::value_type& item : items) {
     doc.push_back(Json::object {
       { "type", "StatisticItem" },

diff --git a/pdns/ws-api.hh b/pdns/ws-api.hh
@@ -41,6 +41,6 @@ void apiCheckQNameAllowedCharacters(const string& name);
 DNSName apiNameToDNSName(const string& name);
 
 // To be provided by product code.
-void productServerStatisticsFetch(std::map<string,string>& out);
+void productServerStatisticsFetch(std::map<string,int>& out);
 
 #endif /* PDNS_WSAPI_HH */
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
@@ -424,15 +424,15 @@ static void fillZone(const DNSName& zonename, HttpResponse* resp) {
   resp->setBody(doc);
 }
 
-void productServerStatisticsFetch(map<string,string>& out)
+void productServerStatisticsFetch(map<string,int>& out)
 {
   vector<string> items = S.getEntries();
   for(const string& item :  items) {
-    out[item] = std::to_string(S.read(item));
+    out[item] = std::stoi(std::to_string(S.read(item)));
   }
 
   // add uptime
-  out["uptime"] = std::to_string(time(0) - s_starttime);
+  out["uptime"] = time(0) - s_starttime;
 }
 
 static void gatherRecords(const Json container, const DNSName& qname, const QType qtype, const int ttl, vector<DNSResourceRecord>& new_records, vector<DNSResourceRecord>& new_ptrs) {