From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Wed, 14 Nov 2018 08:42:49 +0000 (+0100)
Subject: Merge pull request #6959 from Gibheer/master
X-Git-Tag: auth-4.2.0-alpha1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=479f3c423e45fcced9b47105bc903245515b3004;p=thirdparty%2Fpdns.git

Merge pull request #6959 from Gibheer/master

add namespace and instance variable to carbon key
---

479f3c423e45fcced9b47105bc903245515b3004
diff --cc pdns/auth-carbon.cc
index 325bac326e,9c3697aef6..374b243ccd
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@@ -35,9 -34,9 +35,10 @@@
  void* carbonDumpThread(void*)
  try
  {
 +  setThreadName("pdns/carbonDump");
    extern StatBag S;
  
+   string namespace_name=arg()["carbon-namespace"];
    string hostname=arg()["carbon-ourname"];
    if(hostname.empty()) {
      char tmp[80];