From 280d6657a8d226a1043b7a4fc1613af0bb90a3ed Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 15 Mar 2016 11:51:43 +0100
Subject: [PATCH] Add a disable-syslog setting

This allows the use of e.g. the `Type=simple` in systemd and prevents
the double logging issue.
---
 pdns/common_startup.cc | 1 +
 pdns/logger.cc         | 2 +-
 pdns/logger.hh         | 5 +++++
 pdns/pdns.conf-dist    | 5 +++++
 pdns/pdns_recursor.cc  | 2 ++
 pdns/receiver.cc       | 1 +
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 45ab21dc06..b9c2165de5 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -78,6 +78,7 @@ void declareArguments()
   ::arg().set("version-string","PowerDNS version in packets - full, anonymous, powerdns or custom")="full"; 
   ::arg().set("control-console","Debugging switch - don't use")="no"; // but I know you will!
   ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="4";
+  ::arg().set("disable-syslog","Disable logging to syslog, useful when running inside a supervisor that logs stdout")="no";
   ::arg().set("default-soa-name","name to insert in the SOA record if none set in the backend")="a.misconfigured.powerdns.server";
   ::arg().set("default-soa-mail","mail address to insert in the SOA record if none set in the backend")="";
   ::arg().set("distributor-threads","Default number of Distributor (backend) threads to start")="3";
diff --git a/pdns/logger.cc b/pdns/logger.cc
index 5e6fd2b8b0..6357bffa62 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -50,7 +50,7 @@ void Logger::log(const string &msg, Urgency u)
     clog<<buffer;
     clog <<msg <<endl;
   }
-  if( u <= d_loglevel ) {
+  if( u <= d_loglevel && !d_disableSyslog ) {
 #ifndef RECURSOR
     S.ringAccount("logmessages",msg);
 #endif
diff --git a/pdns/logger.hh b/pdns/logger.hh
index 2c3b449636..4a52a5005c 100644
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -58,6 +58,10 @@ public:
   void toConsole(Urgency);
   void setLoglevel( Urgency );
 
+  void disableSyslog(bool d) {
+    d_disableSyslog = d;
+  }
+
   //! Log to a file.
   void toFile( const string & filename );
   
@@ -91,6 +95,7 @@ private:
   Urgency d_loglevel;
   Urgency consoleUrgency;
   pthread_mutex_t lock;
+  bool d_disableSyslog;
 };
 
 extern Logger &theL(const string &pname="");
diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 8ba6ce13e9..b9c0bd2ee0 100644
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -134,6 +134,11 @@
 #
 # disable-axfr-rectify=no
 
+#################################
+# disable-syslog	Disable logging to syslog, useful when running inside a supervisor that logs stdout
+#
+# disable-syslog=no
+
 #################################
 # disable-tcp	Do not listen to TCP queries
 #
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 3c4efdf589..79e5e5a267 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1749,6 +1749,7 @@ int serviceMain(int argc, char*argv[])
   L.setName(s_programname);
 
   L.setLoglevel((Logger::Urgency)(6)); // info and up
+  L.disableSyslog(::arg().mustDo("disable-syslog"));
 
   if(!::arg()["logging-facility"].empty()) {
     int val=logFacilityToLOG(::arg().asNum("logging-facility") );
@@ -2086,6 +2087,7 @@ int main(int argc, char **argv)
     ::arg().set("trace","if we should output heaps of logging. set to 'fail' to only log failing domains")="off";
     ::arg().set("daemon","Operate as a daemon")="yes";
     ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="4";
+    ::arg().set("disable-syslog","Disable logging to syslog, useful when running inside a supervisor that logs stdout")="no";
     ::arg().set("log-common-errors","If we should log rather common errors")="yes";
     ::arg().set("chroot","switch to chroot jail")="";
     ::arg().set("setgid","If set, change group id to this gid for more security")="";
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index a2f559165d..22257b9a6c 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -450,6 +450,7 @@ int main(int argc, char **argv)
     }
 
     L.setLoglevel((Logger::Urgency)(::arg().asNum("loglevel")));
+    L.disableSyslog(::arg().mustDo("disable-syslog"));
     L.toConsole((Logger::Urgency)(::arg().asNum("loglevel")));  
 
     if(::arg().mustDo("help") || ::arg().mustDo("config")) {
-- 
2.47.2