From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 14 Feb 2025 07:30:41 +0000 (+0100)
Subject: Merge pull request #15114 from omoerbeek/rec-rust-web
X-Git-Tag: dnsdist-2.0.0-alpha1~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc7d8cd2a063b916ae39fcdb6ba5bff945c99a07;p=thirdparty%2Fpdns.git

Merge pull request #15114 from omoerbeek/rec-rust-web

rec: move to embedded web service written in Rust
---

cc7d8cd2a063b916ae39fcdb6ba5bff945c99a07
diff --cc pdns/recursordist/rec-main.cc
index 43a8c37b0b,9718d44f9b..3fae0825f6
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@@ -349,10 -355,10 +354,13 @@@ int RecThreadInfo::runThreads(Logr::log
      info.setHandler();
      info.start(currentThreadId, "web+stat", cpusMap, log);
  
+     if (::arg().mustDo("webserver")) {
+       serveRustWeb();
+     }
      for (auto& tInfo : RecThreadInfo::infos()) {
 +      if (tInfo.getName() == "web+stat") { // XXX testing for isHandler() does not work as expected!
 +        continue;
 +      }
        tInfo.thread.join();
        if (tInfo.exitCode != 0) {
          ret = tInfo.exitCode;