From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Thu, 30 Jan 2014 19:04:15 +0000 (+0100)
Subject: rename JWebserver -> RecursorWebServer
X-Git-Tag: rec-3.6.0-rc1~211^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ce57618477ca19dd62752ed93157621f1f42b4f;p=thirdparty%2Fpdns.git

rename JWebserver -> RecursorWebServer
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 0d8f9b8a53..c06a1ae2d9 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1918,7 +1918,7 @@ try
     if(::arg().mustDo("experimental-json-interface")) {
       L<<Logger::Warning << "Enabling JSON interface" << endl;
       try {
-        new JWebserver(t_fdm);
+        new RecursorWebServer(t_fdm);
       }
       catch(PDNSException &e) {
         L<<Logger::Error<<"Exception: "<<e.reason<<endl;
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 3b19327fa6..139a4dfe84 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -38,7 +38,7 @@
 
 using namespace rapidjson;
 
-JWebserver::JWebserver(FDMultiplexer* fdm)
+RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
 {
   RecursorControlParser rcp; // inits
 
@@ -48,12 +48,12 @@ JWebserver::JWebserver(FDMultiplexer* fdm)
   d_ws = new AsyncWebServer(fdm, arg()["webserver-address"], arg().asNum("webserver-port"), arg()["webserver-password"]);
 
   // legacy dispatch
-  d_ws->registerApiHandler("/jsonstat", boost::bind(&JWebserver::jsonstat, this, _1, _2));
+  d_ws->registerApiHandler("/jsonstat", boost::bind(&RecursorWebServer::jsonstat, this, _1, _2));
 
   d_ws->go();
 }
 
-void JWebserver::jsonstat(HttpRequest* req, HttpResponse *resp)
+void RecursorWebServer::jsonstat(HttpRequest* req, HttpResponse *resp)
 {
   string command;
 
diff --git a/pdns/ws-recursor.hh b/pdns/ws-recursor.hh
index ed40ee1c32..3f239d30c6 100644
--- a/pdns/ws-recursor.hh
+++ b/pdns/ws-recursor.hh
@@ -24,10 +24,10 @@
 #include "mplexer.hh"
 #include "webserver.hh"
 
-class JWebserver : public boost::noncopyable
+class RecursorWebServer : public boost::noncopyable
 {
 public:
-  explicit JWebserver(FDMultiplexer* fdm);
+  explicit RecursorWebServer(FDMultiplexer* fdm);
   void jsonstat(HttpRequest* req, HttpResponse *resp);
 
 private: