From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 29 Nov 2024 15:33:08 +0000 (+0100)
Subject: Also start web service in single thread case
X-Git-Tag: dnsdist-2.0.0-alpha1~95^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75dd1746d3a7da874e0a4291cfbefb24609b37d2;p=thirdparty%2Fpdns.git

Also start web service in single thread case
---

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 714bbe5ac8..48e963ae1a 100644
--- 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 5bf734313e..0c57de01a5 100644
--- 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 f1758e7082..7dfcec091f 100644
--- 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();