From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 8 Mar 2019 09:11:51 +0000 (+0100)
Subject: Don't use doLog.hh in recursor, ifdef around it.
X-Git-Tag: dnsdist-1.4.0-beta1~13^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f0ed4dc8df752e97d8506a59d0a708a052c05f;p=thirdparty%2Fpdns.git

Don't use doLog.hh in recursor, ifdef around it.
---

diff --git a/pdns/fstrm_logger.cc b/pdns/fstrm_logger.cc
index 7df889b049..62ccd72ebd 100644
--- a/pdns/fstrm_logger.cc
+++ b/pdns/fstrm_logger.cc
@@ -3,7 +3,12 @@
 
 #include "config.h"
 #include "fstrm_logger.hh"
+
+#ifdef RECURSOR
+#include "logger.hh"
+#else
 #include "dolog.hh"
+#endif
 
 #define DNSTAP_CONTENT_TYPE		"protobuf:dnstap.Dnstap"
 
@@ -176,7 +181,11 @@ void FrameStreamLogger::queueData(const std::string& data)
   }
   uint8_t *frame = (uint8_t*)malloc(data.length());
   if (!frame) {
+#ifdef RECURSOR
+    g_log<<Logger::Warning<<"FrameStreamLogger: cannot allocate memory for stream."<<std::endl;
+#else
     warnlog("FrameStreamLogger: cannot allocate memory for stream.");
+#endif
     return;
   }
   memcpy(frame, data.c_str(), data.length());
@@ -188,11 +197,19 @@ void FrameStreamLogger::queueData(const std::string& data)
     // Frame successfully queued.
   } else if (res == fstrm_res_again) {
     free(frame);
+#ifdef RECURSOR
+    g_log<<Logger::Warning<<"FrameStreamLogger: queue full, dropping."<<std::endl;
+#else
     warnlog("FrameStreamLogger: queue full, dropping.");
-  } else {
+#endif
+ } else {
     // Permanent failure.
     free(frame);
+#ifdef RECURSOR
+    g_log<<Logger::Warning<<"FrameStreamLogger: submitting to queue failed."<<std::endl;
+#else
     warnlog("FrameStreamLogger: submitting to queue failed.");
+#endif
   }
 }
 
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 9ebce5994f..ffbffa6316 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -390,7 +390,7 @@ endif
 
 if FSTRM
 pdns_recursor_SOURCES += \
-	dnstap.cc dnstap.hh fstrm_logger.cc fstrm_logger.hh dolog.hh
+	dnstap.cc dnstap.hh fstrm_logger.cc fstrm_logger.hh
 
 pdns_recursor_LDADD += \
 	$(FSTRM_LIBS)
diff --git a/pdns/recursordist/dolog.hh b/pdns/recursordist/dolog.hh
deleted file mode 120000
index e458b07d27..0000000000
--- a/pdns/recursordist/dolog.hh
+++ /dev/null
@@ -1 +0,0 @@
-../dolog.hh
\ No newline at end of file