From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 12 May 2021 10:46:44 +0000 (+0200)
Subject: Take into account q_quiet when determing loglevel and change a few
X-Git-Tag: auth-4.5.0-beta1~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10396%2Fhead;p=thirdparty%2Fpdns.git

Take into account q_quiet when determing loglevel and change a few
loglevels.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index f0d79cb682..0a805b6c4b 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4001,7 +4001,7 @@ static void handleRCC(int fd, FDMultiplexer::funcparam_t& var)
     RecursorControlParser rcp;
     RecursorControlParser::func_t* command;
 
-    g_log << Logger::Notice << "Received rec_control command '" << msg << "' from control socket" << endl;
+    g_log << Logger::Info << "Received rec_control command '" << msg << "' from control socket" << endl;
     auto answer = rcp.getAnswer(fd, msg, &command);
 
     // If we are inside a chroot, we need to strip
@@ -4653,8 +4653,6 @@ static int serviceMain(int argc, char*argv[])
     g_log<<Logger::Warning<<endl;
   }
 
-  g_quiet=::arg().mustDo("quiet");
-
   /* this needs to be done before parseACLs(), which call broadcastFunction() */
   g_weDistributeQueries = ::arg().mustDo("pdns-distributes-queries");
   if(g_weDistributeQueries) {
@@ -5728,6 +5726,7 @@ int main(int argc, char **argv)
     g_recCache = std::unique_ptr<MemRecursorCache>(new MemRecursorCache(::arg().asNum("record-cache-shards")));
     g_negCache = std::unique_ptr<NegCache>(new NegCache(::arg().asNum("record-cache-shards")));
 
+    g_quiet=::arg().mustDo("quiet");
     Logger::Urgency logUrgency = (Logger::Urgency)::arg().asNum("loglevel");
 
     if (logUrgency < Logger::Error)
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 103bfa73af..90bb1ffde5 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -4425,7 +4425,7 @@ int SyncRes::getRootNS(struct timeval now, asyncresolve_t asyncCallback, unsigne
     g_log<<Logger::Notice<<"Refreshed . records"<<endl;
   }
   else
-    g_log<<Logger::Error<<"Failed to update . records, RCODE="<<res<<endl;
+    g_log<<Logger::Warning<<"Failed to update . records, RCODE="<<res<<endl;
 
   return res;
 }