From: Remi Gacogne <rgacogne@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:43:58 +0000 (+0100)
Subject: Merge pull request #6689 from rgacogne/logger-thread-local-static
X-Git-Tag: rec-4.2.0-alpha1~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40df43f07418166adaff2d3908e28907de26a536;p=thirdparty%2Fpdns.git

Merge pull request #6689 from rgacogne/logger-thread-local-static

logger: Use a function-level static var for the logger object
---

40df43f07418166adaff2d3908e28907de26a536
diff --cc pdns/logger.cc
index cd56e5d78d,852d486e9b..dd890478b1
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@@ -184,13 -173,71 +173,13 @@@ Logger& Logger::operator<<(const char *
    return *this;
  }
  
 -Logger& Logger::operator<<(int i)
 -{
 -  ostringstream tmp;
 -  tmp<<i;
 -
 -  *this<<tmp.str();
 -
 -  return *this;
 -}
 -
 -Logger& Logger::operator<<(double i)
 -{
 -  ostringstream tmp;
 -  tmp<<i;
 -  *this<<tmp.str();
 -  return *this;
 -}
 -
 -Logger& Logger::operator<<(unsigned int i)
 -{
 -  ostringstream tmp;
 -  tmp<<i;
 -
 -  *this<<tmp.str();
 -
 -  return *this;
 -}
 -
 -Logger& Logger::operator<<(unsigned long i)
 -{
 -  ostringstream tmp;
 -  tmp<<i;
 -
 -  *this<<tmp.str();
 -
 -  return *this;
 -}
 -
 -Logger& Logger::operator<<(unsigned long long i)
 -{
 -  ostringstream tmp;
 -  tmp<<i;
 -
 -  *this<<tmp.str();
 -
 -  return *this;
 -}
 -
 -Logger& Logger::operator<<(long i)
 -{
 -  ostringstream tmp;
 -  tmp<<i;
 -
 -  *this<<tmp.str();
 -
 -  return *this;
 -}
 -
  Logger& Logger::operator<<(ostream & (&)(ostream &))
  {
-   PerThread* pt =getPerThread();
+   PerThread& pt = getPerThread();
  
-   log(pt->d_output, pt->d_urgency);
-   pt->d_output.clear();
-   pt->d_urgency=Info;
+   log(pt.d_output, pt.d_urgency);
+   pt.d_output.clear();
+   pt.d_urgency=Info;
    return *this;
  }