From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Wed, 21 Aug 2013 16:14:31 +0000 (+0200)
Subject: add convience getKindString to DomainInfo
X-Git-Tag: rec-3.6.0-rc1~509^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec10217f231ca462cd00041918863bd032ac6c2a;p=pdns

add convience getKindString to DomainInfo
---

diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh
index 46478721d..2215bec53 100644
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@ -57,6 +57,12 @@ struct DomainInfo
   {
     return zone < rhs.zone;
   }
+
+  const char *getKindString() const
+  {
+    const char *kinds[]={"Master", "Slave", "Native"};
+    return kinds[kind];
+  }
 };
 
 class DNSPacket;
diff --git a/pdns/ws.cc b/pdns/ws.cc
index 1581839bc..d7ebe2856 100644
--- a/pdns/ws.cc
+++ b/pdns/ws.cc
@@ -485,7 +485,6 @@ string StatWebServer::jsonstat(const string& method, const string& post, const m
     ret += makeLogGrepJSON(ourvarmap, ::arg()["experimental-logfile"], " pdns[");
   }
  
-  const char *kinds[]={"Master", "Slave", "Native"};
   if(command=="domains") {
     UeberBackend B;
     vector<DomainInfo> domains;
@@ -501,7 +500,7 @@ string StatWebServer::jsonstat(const string& method, const string& post, const m
       Value jdi;
       jdi.SetObject();
       jdi.AddMember("name", di.zone.c_str(), doc.GetAllocator());
-      jdi.AddMember("kind", kinds[di.kind], doc.GetAllocator());
+      jdi.AddMember("kind", di.getKindString(), doc.GetAllocator());
       string masters = boost::join(di.masters, " ");
       Value jmasters;
       jmasters.SetString(masters.c_str(), masters.size(), doc.GetAllocator());