dnsdist: Do not build carbon support when DISABLE_CARBON is defined

diff --git a/pdns/dnsdist-carbon.cc b/pdns/dnsdist-carbon.cc
index e411c09befba47af52a0cf62d8b9dbd9ca722849..cb0bc5fdf46cb133e4b688da83043cf35c964ac6 100644 (file)
--- a/pdns/dnsdist-carbon.cc
+++ b/pdns/dnsdist-carbon.cc
@@ -25,18 +25,13 @@
 
 #include "dnsdist-carbon.hh"
 #include "dnsdist.hh"
-#include "dnsdist-carbon.hh"
+
+#ifndef DISABLE_CARBON
 #include "dolog.hh"
 #include "sstuff.hh"
 #include "threadname.hh"
 
 GlobalStateHolder<vector<CarbonConfig> > g_carbon;
-static time_t s_start = time(nullptr);
-
-uint64_t uptimeOfProcess(const std::string& str)
-{
-  return time(nullptr) - s_start;
-}
 
 void carbonDumpThread()
 {
@@ -278,3 +273,11 @@ void carbonDumpThread()
     errlog("Carbon thread died");
   }
 }
+#endif /* DISABLE_CARBON */
+
+static time_t s_start = time(nullptr);
+
+uint64_t uptimeOfProcess(const std::string& str)
+{
+  return time(nullptr) - s_start;
+}

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index db5de00859fc1690c43200e90dd3e7f58137a72a..13bdb4de2207ff28d71c353c7b5c542ccf71e6d1 100644 (file)
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -941,6 +941,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
     return std::shared_ptr<DownstreamState>(nullptr);
   });
 
+#ifndef DISABLE_CARBON
   luaCtx.writeFunction("carbonServer", [](const std::string& address, boost::optional<string> ourName, boost::optional<unsigned int> interval, boost::optional<string> namespace_name, boost::optional<string> instance_name) {
     setLuaSideEffect();
     auto ours = g_carbon.getCopy();
@@ -951,6 +952,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
                     interval ? *interval : 30});
     g_carbon.setState(ours);
   });
+#endif /* DISABLE_CARBON */
 
   luaCtx.writeFunction("webserver", [client, configCheck](const std::string& address, boost::optional<std::string> password, boost::optional<std::string> apiKey, const boost::optional<std::map<std::string, std::string>> customHeaders, const boost::optional<std::string> acl) {
     setLuaSideEffect();

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 68933ea86ef7a60f0aba5b0b0919c3f76cc5d508..3aee155b710f1f90925f49fc1fd1b9fa7e9de930 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -2691,8 +2691,10 @@ int main(int argc, char** argv)
       }
     }
 
+#ifndef DISABLE_CARBON
     thread carbonthread(carbonDumpThread);
     carbonthread.detach();
+#endif /* DISABLE_CARBON */
 
     thread stattid(maintThread);
     stattid.detach();

diff --git a/pdns/dnsdistdist/dnsdist-carbon.hh b/pdns/dnsdistdist/dnsdist-carbon.hh
index 6dbb99541920efd671809c3992c777a88e963b3d..226fa9a483ba01cedbc5e116af7aacfdc1d95742 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-carbon.hh
+++ b/pdns/dnsdistdist/dnsdist-carbon.hh
@@ -21,6 +21,9 @@
  */
 #pragma once
 
+#include "config.h"
+
+#ifndef DISABLE_CARBON
 #include "sholder.hh"
 #include "iputils.hh"
 
@@ -35,3 +38,4 @@ struct CarbonConfig
 
 extern GlobalStateHolder<std::vector<CarbonConfig> > g_carbon;
 void carbonDumpThread();
+#endif /* DISABLE_CARBON */