From: Otto <otto.moerbeek@open-xchange.com>
Date: Fri, 16 Apr 2021 13:30:15 +0000 (+0200)
Subject: Reformat
X-Git-Tag: dnsdist-1.7.0-alpha1~146^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10483%2Fhead;p=thirdparty%2Fpdns.git

Reformat
---

diff --git a/.not-formatted b/.not-formatted
index 452069f386..1ff59d93ac 100644
--- a/.not-formatted
+++ b/.not-formatted
@@ -197,8 +197,6 @@
 ./pdns/libssl.cc
 ./pdns/libssl.hh
 ./pdns/lock.hh
-./pdns/logger.cc
-./pdns/logger.hh
 ./pdns/lua-auth4.cc
 ./pdns/lua-auth4.hh
 ./pdns/lua-base4.cc
diff --git a/pdns/logger.cc b/pdns/logger.cc
index 7d920f576f..c2a2de2cac 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -50,116 +50,113 @@ Logger& getLogger()
   return log;
 }
 
-void Logger::log(const string &msg, Urgency u) noexcept
+void Logger::log(const string& msg, Urgency u) noexcept
 {
 #ifndef RECURSOR
   bool mustAccount(false);
 #endif
-  if(u<=consoleUrgency) {
+  if (u <= consoleUrgency) {
     char buffer[50] = "";
     if (d_timestamps) {
       struct tm tm;
       time_t t;
       time(&t);
       localtime_r(&t, &tm);
-      strftime(buffer,sizeof(buffer),"%b %d %H:%M:%S ", &tm);
+      strftime(buffer, sizeof(buffer), "%b %d %H:%M:%S ", &tm);
     }
 
     string prefix;
     if (d_prefixed) {
-      switch(u) {
-        case All:
-          prefix = "[all] ";
-          break;
-        case Alert:
-          prefix = "[ALERT] ";
-          break;
-        case Critical:
-          prefix = "[CRITICAL] ";
-          break;
-        case Error:
-          prefix = "[ERROR] ";
-          break;
-        case Warning:
-          prefix = "[WARNING] ";
-          break;
-        case Notice:
-          prefix = "[NOTICE] ";
-          break;
-        case Info:
-          prefix = "[INFO] ";
-          break;
-        case Debug:
-          prefix = "[DEBUG] ";
-          break;
-        case None:
-          prefix = "[none] ";
-          break;
+      switch (u) {
+      case All:
+        prefix = "[all] ";
+        break;
+      case Alert:
+        prefix = "[ALERT] ";
+        break;
+      case Critical:
+        prefix = "[CRITICAL] ";
+        break;
+      case Error:
+        prefix = "[ERROR] ";
+        break;
+      case Warning:
+        prefix = "[WARNING] ";
+        break;
+      case Notice:
+        prefix = "[NOTICE] ";
+        break;
+      case Info:
+        prefix = "[INFO] ";
+        break;
+      case Debug:
+        prefix = "[DEBUG] ";
+        break;
+      case None:
+        prefix = "[none] ";
+        break;
       }
     }
 
     static std::mutex m;
     std::lock_guard<std::mutex> l(m); // the C++-2011 spec says we need this, and OSX actually does
-    clog << string(buffer) + prefix + msg <<endl;
+    clog << string(buffer) + prefix + msg << endl;
 #ifndef RECURSOR
-    mustAccount=true;
+    mustAccount = true;
 #endif
   }
-  if( u <= d_loglevel && !d_disableSyslog ) {
-    syslog(u,"%s",msg.c_str());
+  if (u <= d_loglevel && !d_disableSyslog) {
+    syslog(u, "%s", msg.c_str());
 #ifndef RECURSOR
-    mustAccount=true;
+    mustAccount = true;
 #endif
   }
 
 #ifndef RECURSOR
-  if(mustAccount) {
-      try {
-        S.ringAccount("logmessages",msg);
-      }
-      catch (const runtime_error& e) {
-        cerr << e.what() << endl;
-      }
+  if (mustAccount) {
+    try {
+      S.ringAccount("logmessages", msg);
+    }
+    catch (const runtime_error& e) {
+      cerr << e.what() << endl;
+    }
   }
 #endif
 }
 
-void Logger::setLoglevel( Urgency u )
+void Logger::setLoglevel(Urgency u)
 {
   d_loglevel = u;
 }
-  
 
 void Logger::toConsole(Urgency u)
 {
-  consoleUrgency=u;
+  consoleUrgency = u;
 }
 
 void Logger::open()
 {
-  if(opened)
+  if (opened)
     closelog();
-  openlog(name.c_str(),flags,d_facility);
-  opened=true;
+  openlog(name.c_str(), flags, d_facility);
+  opened = true;
 }
 
-void Logger::setName(const string &_name)
+void Logger::setName(const string& _name)
 {
-  name=_name;
+  name = _name;
   open();
 }
 
 Logger::Logger(string n, int facility) :
-  name(std::move(n)), flags(LOG_PID|LOG_NDELAY), d_facility(facility), d_loglevel(Logger::None),
-  consoleUrgency(Error), opened(false), d_disableSyslog(false)
+  name(std::move(n)), flags(LOG_PID | LOG_NDELAY), d_facility(facility), d_loglevel(Logger::None), consoleUrgency(Error), opened(false), d_disableSyslog(false)
 {
   open();
-
 }
 
 Logger& Logger::operator<<(Urgency u)
 {
-  getPerThread().d_urgency=u;
+  getPerThread().d_urgency = u;
   return *this;
 }
 
@@ -168,39 +165,38 @@ Logger::PerThread& Logger::getPerThread()
   return t_perThread;
 }
 
-Logger& Logger::operator<<(const string &s)
+Logger& Logger::operator<<(const string& s)
 {
   PerThread& pt = getPerThread();
   pt.d_output.append(s);
   return *this;
 }
 
-Logger& Logger::operator<<(const char *s)
+Logger& Logger::operator<<(const char* s)
 {
-  *this<<string(s);
+  *this << string(s);
   return *this;
 }
 
-Logger& Logger::operator<<(ostream & (&)(ostream &))
+Logger& Logger::operator<<(ostream& (&)(ostream&))
 {
   PerThread& pt = getPerThread();
 
   log(pt.d_output, pt.d_urgency);
   pt.d_output.clear();
-  pt.d_urgency=Info;
+  pt.d_urgency = Info;
   return *this;
 }
 
-Logger& Logger::operator<<(const DNSName &d)
+Logger& Logger::operator<<(const DNSName& d)
 {
-  *this<<d.toLogString();
+  *this << d.toLogString();
 
   return *this;
 }
 
-Logger& Logger::operator<<(const ComboAddress &ca)
+Logger& Logger::operator<<(const ComboAddress& ca)
 {
-  *this<<ca.toLogString();
+  *this << ca.toLogString();
   return *this;
 }
-
diff --git a/pdns/logger.hh b/pdns/logger.hh
index 5160c8f4aa..dc86efbcd7 100644
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -35,42 +35,67 @@
 class Logger
 {
 public:
-  Logger(string , int facility=LOG_DAEMON); //!< pass the identification you wish to appear in the log
+  Logger(string, int facility = LOG_DAEMON); //!< pass the identification you wish to appear in the log
 
   //! The urgency of a log message
-  enum Urgency {All=32767,Alert=LOG_ALERT, Critical=LOG_CRIT, Error=LOG_ERR, Warning=LOG_WARNING,
-                Notice=LOG_NOTICE,Info=LOG_INFO, Debug=LOG_DEBUG, None=-1};
+  enum Urgency
+  {
+    All = 32767,
+    Alert = LOG_ALERT,
+    Critical = LOG_CRIT,
+    Error = LOG_ERR,
+    Warning = LOG_WARNING,
+    Notice = LOG_NOTICE,
+    Info = LOG_INFO,
+    Debug = LOG_DEBUG,
+    None = -1
+  };
 
   /** Log a message.
       \param msg Message you wish to log
       \param u Urgency of the message you wish to log
   */
-  void log(const string &msg, Urgency u=Notice) noexcept;
+  void log(const string& msg, Urgency u = Notice) noexcept;
 
-  void setFacility(int f){d_facility=f;open();} //!< Choose logging facility
-  void setFlag(int f){flags|=f;open();} //!< set a syslog flag
-  void setName(const string &);
+  void setFacility(int f)
+  {
+    d_facility = f;
+    open();
+  } //!< Choose logging facility
+  void setFlag(int f)
+  {
+    flags |= f;
+    open();
+  } //!< set a syslog flag
+  void setName(const string&);
 
   //! set lower limit of urgency needed for console display. Messages of this urgency, and higher, will be displayed
   void toConsole(Urgency);
-  void setLoglevel( Urgency );
+  void setLoglevel(Urgency);
 
-  void disableSyslog(bool d) {
+  void disableSyslog(bool d)
+  {
     d_disableSyslog = d;
   }
 
-  void setTimestamps(bool t) {
+  void setTimestamps(bool t)
+  {
     d_timestamps = t;
   }
 
-  void setPrefixed(bool p) {
+  void setPrefixed(bool p)
+  {
     d_prefixed = p;
   }
 
   //! Log to a file.
-  void toFile( const string & filename );
+  void toFile(const string& filename);
 
-  void resetFlags(){flags=0;open();} //!< zero the flags
+  void resetFlags()
+  {
+    flags = 0;
+    open();
+  } //!< zero the flags
   /** Use this to stream to your log, like this:
       \code
       g_log<<"This is an informational message"<<endl; // logged at default loglevel (Info)
@@ -78,11 +103,11 @@ public:
       g_log<<"This is an informational message"<<endl; // logged AGAIN at default loglevel (Info)
       \endcode
   */
-  Logger& operator<<(const char *s);
-  Logger& operator<<(const string &s);   //!< log a string
+  Logger& operator<<(const char* s);
+  Logger& operator<<(const string& s); //!< log a string
   Logger& operator<<(const DNSName&);
   Logger& operator<<(const ComboAddress&); //!< log an address
-  Logger& operator<<(Urgency);    //!< set the urgency, << style
+  Logger& operator<<(Urgency); //!< set the urgency, << style
 
   Logger& operator<<(const QType& qtype)
   {
@@ -97,19 +122,22 @@ public:
   }
 
   // Using const & since otherwise SyncRes:: values induce (illegal) copies
-  template<typename T> Logger & operator<<(const T& i) {
+  template <typename T>
+  Logger& operator<<(const T& i)
+  {
     ostringstream tmp;
     tmp << i;
     *this << tmp.str();
     return *this;
   }
 
-  Logger& operator<<(std::ostream & (&)(std::ostream &)); //!< this is to recognise the endl, and to commit the log
+  Logger& operator<<(std::ostream& (&)(std::ostream&)); //!< this is to recognise the endl, and to commit the log
 
 private:
   struct PerThread
   {
-    PerThread() : d_urgency(Info)
+    PerThread() :
+      d_urgency(Info)
     {}
     string d_output;
     Urgency d_urgency;