Also start web service in single thread case

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 714bbe5ac89df08a82df9299d08b5fcef88ad0a9..48e963ae1ac706240311d899c1ba3e7b4ad7bed4 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -27,7 +27,6 @@
 #include <iostream>
 #include <cstdio>
 #include <functional>
-#include <bitset>
 #include "pdnsexception.hh"
 #include "misc.hh"
 #include <netdb.h>

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 5bf734313e72be9bb11e17124a82728258ce4e0f..0c57de01a5970e08d278617daf873c08de0f3236 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -542,9 +542,9 @@ rec_control_SOURCES = \
        rcpgenerator.cc rcpgenerator.hh \
        rec-lua-conf.cc rec-lua-conf.hh \
        rec-system-resolve.cc rec-system-resolve.hh \
+       rec-web-stubs.hh \
        rec_channel.cc rec_channel.hh \
        rec_control.cc \
-       rec-web-stubs.hh \
        settings/cxxsupport.cc \
        sillyrecords.cc \
        sortlist.cc sortlist.hh \

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index f1758e7082de3abb36f30c5821086907a5b798c5..7dfcec091fd512fdb608f4012c54f1b11f04735b 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -273,6 +273,11 @@ int RecThreadInfo::runThreads(Logr::log_t log)
       taskInfo.start(currentThreadId, "task", cpusMap, log);
     }
 
+    if (::arg().mustDo("webserver")) {
+      extern void serveRustWeb();
+      serveRustWeb();
+    }
+
     currentThreadId = 1;
     auto& info = RecThreadInfo::info(currentThreadId);
     info.setListener();