Modify journal availability test.

To both test for NOTIFY_SOCKET (to see if we're runnign underst systemd)
and availbility of the journal socket (to see if systemd-journal is
active)

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 9282c8927860260c2367cc7b366f636b4233fa35..dfd16a7617b9161a7fc67e1f9155c3b75db4bd3e 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2762,11 +2762,13 @@ int main(int argc, char** argv)
 
 #ifdef HAVE_SYSTEMD
     if (getenv("NOTIFY_SOCKET") != nullptr) {
-      g_slog = Logging::Logger::create(loggerSDBackend);
+      if (int fd = sd_journal_stream_fd("pdns-recusor", LOG_DEBUG, 0); fd >= 0) {
+        g_slog = Logging::Logger::create(loggerSDBackend);
+        close(fd);
+      }
     }
-    else
 #endif
-    {
+    if (g_slog == nullptr) {
       g_slog = Logging::Logger::create(loggerBackend);
     }
     // Missing: a mechanism to call setVerbosity(x)