From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 25 Apr 2016 15:51:13 +0000 (+0200)
Subject: recursor: add sd_notify() support
X-Git-Tag: rec-4.0.0-alpha3~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b6720de8dd7c3f9bdad7e330f0c29dd8f9661a9;p=thirdparty%2Fpdns.git

recursor: add sd_notify() support
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 2978f11d96..7fecde0463 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -88,6 +88,10 @@ extern SortList g_sortlist;
 #include "dnsmessage.pb.h"
 #endif
 
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
 #ifndef RECURSOR
 #include "statbag.hh"
 StatBag S;
@@ -2657,6 +2661,9 @@ int serviceMain(int argc, char*argv[])
 
   if(g_numThreads == 1) {
     L<<Logger::Warning<<"Operating unthreaded"<<endl;
+#ifdef HAVE_SYSTEMD
+    sd_notify(0, "READY=1");
+#endif
     recursorThread(0);
   }
   else {
@@ -2666,8 +2673,9 @@ int serviceMain(int argc, char*argv[])
       pthread_create(&tid, 0, recursorThread, (void*)(long)n);
     }
     void* res;
-
-
+#ifdef HAVE_SYSTEMD
+    sd_notify(0, "READY=1");
+#endif
     pthread_join(tid, &res);
   }
   return 0;
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 61e3eb8eb2..1e4a7578dd 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -1,6 +1,6 @@
 JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la
 
-AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN110_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\"
+AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN110_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
 
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/ext/json11 \
@@ -136,7 +136,8 @@ pdns_recursor_LDADD = \
 	$(YAHTTP_LIBS) \
 	$(JSON11_LIBS) \
 	$(OPENSSL_LIBS) \
-	$(BOOST_CONTEXT_LIBS)
+	$(BOOST_CONTEXT_LIBS) \
+	$(SYSTEMD_LIBS)
 
 pdns_recursor_LDFLAGS = $(AM_LDFLAGS) \
 	$(OPENSSL_LDFLAGS)
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index f67b816f64..681bd77f9e 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -116,6 +116,8 @@ AS_IF([test "x$enable_hardening" != "xno"], [
 PDNS_ENABLE_SANITIZERS
 PDNS_ENABLE_MALLOC_TRACE
 PDNS_WITH_PROTOBUF
+AX_AVAILABLE_SYSTEMD
+AM_CONDITIONAL([HAVE_SYSTEMD], [ test x"$systemd" = "xy" ])
 PDNS_CHECK_PANDOC
 
 AC_SUBST(LIBS)
diff --git a/pdns/recursordist/m4/ax_arg_default_enable_disable.m4 b/pdns/recursordist/m4/ax_arg_default_enable_disable.m4
new file mode 120000
index 0000000000..dcdfa5baa5
--- /dev/null
+++ b/pdns/recursordist/m4/ax_arg_default_enable_disable.m4
@@ -0,0 +1 @@
+../../../m4/ax_arg_default_enable_disable.m4
\ No newline at end of file
diff --git a/pdns/recursordist/m4/systemd.m4 b/pdns/recursordist/m4/systemd.m4
new file mode 120000
index 0000000000..d95ceb7cf2
--- /dev/null
+++ b/pdns/recursordist/m4/systemd.m4
@@ -0,0 +1 @@
+../../../m4/systemd.m4
\ No newline at end of file