]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #15114 from omoerbeek/rec-rust-web
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 14 Feb 2025 07:30:41 +0000 (08:30 +0100)
committerGitHub <noreply@github.com>
Fri, 14 Feb 2025 07:30:41 +0000 (08:30 +0100)
rec: move to embedded web service written in Rust

1  2 
pdns/recursordist/Makefile.am
pdns/recursordist/meson.build
pdns/recursordist/rec-main.cc
pdns/recursordist/rec-main.hh
pdns/recursordist/rec_channel_rec.cc
pdns/recursordist/reczones.cc
pdns/recursordist/test-settings.cc
pdns/recursordist/ws-recursor.cc
pdns/recursordist/ws-recursor.hh
regression-tests.recursor-dnssec/runtests

Simple merge
Simple merge
index 43a8c37b0b79abfd90c9c8b8159c5c1586a684d8,9718d44f9be70682268629b8596eabaeae618618..3fae0825f6ae39677a4cdd0565e55230429fd978
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge