improvement in argtng error logging

bring qgen back to life

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@333 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/argtng.hh b/pdns/argtng.hh
index 7b60878b61729c2a229ee9bc36da59c0676eeeb8..c1b6ec194db44fc7059416e6b976c0cf4b50d13e 100644 (file)
--- a/pdns/argtng.hh
+++ b/pdns/argtng.hh
@@ -248,7 +248,7 @@ private:
     static const regex r("^--([a-z0-9-]*)=(.*)$");
     match_results<string::const_iterator> res;
     if(!regex_match(s,res,r))
-      throw argument_exception("does not match");
+      throw argument_exception("argument item does not match, should be --var=val");
 
     string var(res[1].first, res[1].second);
     string val(res[2].first, res[2].second);

diff --git a/pdns/qgen.cc b/pdns/qgen.cc
index 173e78a2686b28d8670ebb45c3a732ebb7b1081c..d0a66ba118056edee0a9cd7d12b0658eea52aabe 100644 (file)
--- a/pdns/qgen.cc
+++ b/pdns/qgen.cc
@@ -216,6 +216,7 @@ void QGen::printStats(bool force)
 
 void QGen::start()
 {
+
   while(fillAndSendQuestions()) {
     printStats();
     processAnswers();
@@ -241,6 +242,7 @@ void QGen::processAnswers()
   while(waitForData(d_clientsock, first ? 1 : 0) > 0) {
     first=false;
     len=recvfrom(d_clientsock, reinterpret_cast<char *>(buf), sizeof(buf)-1,0,(struct sockaddr*)(&fromaddr), &addrlen);
+
     DNSPacket p;
     vector<DNSResourceRecord> answers;
     try {
@@ -256,8 +258,6 @@ void QGen::processAnswers()
       continue;
     }
     
-
-
     OutstandingQuestion oq;
     oq.qname=p.qdomain;
     oq.id=p.d.id;
@@ -302,8 +302,8 @@ void QGen::processAnswers()
          cout<<"\n";
        }
 
-      if(!gotOne)
-       cout<<p.qdomain<<" "<<p.qtype.getName()<<" NO RECORD"<<endl;
+      //      if(!gotOne)
+      //       cout<<p.qdomain<<" "<<p.qtype.getName()<<" NO RECORD"<<endl;
 
       d_answeredOK++;
       d_questions.erase(i);
@@ -325,6 +325,7 @@ try
   at.add("timeout",Numeric(),"30");
   at.parse(argc, argv);
   at.constraints();
+  arg().set("no-shuffle","Don't change")="off";
 
   string fileName=at.get("questions");
   string server=at.get("server");
@@ -348,7 +349,9 @@ catch(exception &e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;
 }
+/*
 catch(...)
 {
-  cerr<<"Caught something??"<<endl;
+  cerr<<"Unknown fatal exception"<<endl;
 }
+*/