Changeset 631 for trunk/pdns/pdns/rec_channel_rec.cc

Timestamp:

03/27/06 00:16:00 (7 years ago)

Author:

ahu

Message:

trim some build dependencies, make rec_control/pdns_recursor grok /var/run as place for the controlsocket,
add tcp-questions in all the right places, add callback so 'rec_control quit' gets a response before the program quits

Files:

• trunk/pdns/pdns/rec_channel_rec.cc (modified) (6 diffs)

trunk/pdns/pdns/rec_channel_rec.cc

@@ -12 +12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
+#include "logger.hh"
 
 using namespace std;
@@ -99 +100 @@
   optional<float> delay=g_stats.queryrate.get(now, 10);
   if(delay)
-    return 1000000/(*delay);
+    return (uint32_t)(1000000/(*delay));
   else
     return 0;
@@ -106 +107 @@
 RecursorControlParser::RecursorControlParser()
 {
-  extern uint64_t qcounter;
-  addGetStat("questions", &qcounter);
+  addGetStat("questions", &g_stats.qcounter);
+  addGetStat("tcp-questions", &g_stats.tcpqcounter);
 
   addGetStat("cache-hits", &RC.cacheHits);
@@ -125 +126 @@
   addGetStat("qa-latency", &g_stats.avgLatencyUsec);
 
-  addGetStat("all-questions", &qcounter);
   addGetStat("negcache-entries", boost::bind(&SyncRes::negcache_t::size, ref(SyncRes::s_negcache)));
   addGetStat("throttle-entries", boost::bind(&SyncRes::throttle_t::size, ref(SyncRes::s_throttle)));
@@ -140 +140 @@
 }
 
-string RecursorControlParser::getAnswer(const string& question)
+static void doExit()
 {
+  L<<Logger::Error<<"Exiting on user request"<<endl;
+  exit(1);
+}
+
+string RecursorControlParser::getAnswer(const string& question, RecursorControlParser::func_t** command)
+{
+  *command=nop;
   vector<string> words;
   stringtok(words, question);
 
   if(words.empty())
-    return "invalid command";
+    return "invalid command\n";
 
   string cmd=toLower(words[0]);
@@ -154 +161 @@
     return doGet(begin, end);
 
-  if(cmd=="quit") 
-    exit(1);
+  if(cmd=="quit") {
+    *command=&doExit;
+    return "bye\n";
+  }
 
   if(cmd=="dump-cache")