Skip to content

Commit

Permalink
Process very initial review comments (docs and comments and trivial c…
Browse files Browse the repository at this point in the history
…hanges)
  • Loading branch information
omoerbeek committed Feb 4, 2025
1 parent b9d5d92 commit 6e1bfee
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 24 deletions.
2 changes: 0 additions & 2 deletions .github/actions/spell-check/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,6 @@ nproxy
NPTL
NSes
NSID
nsid
nsis
nsrecord
nsset
Expand Down Expand Up @@ -1498,7 +1497,6 @@ Viala
viewcode
visitedlinkcolor
Vixie
vixie
vla
Voegeli
Volker
Expand Down
17 changes: 0 additions & 17 deletions pdns/recursordist/rec-main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2920,26 +2920,9 @@ static void recursorThread()
}

t_fdm = unique_ptr<FDMultiplexer>(getMultiplexer(log));
#if 0
std::unique_ptr<RecursorWebServer> rws;
#endif
t_fdm->addReadFD(threadInfo.getPipes().readToThread, handlePipeRequest);

if (threadInfo.isHandler()) {
#if 0
if (::arg().mustDo("webserver")) {
SLOG(g_log << Logger::Warning << "Enabling web server" << endl,
log->info(Logr::Info, "Enabling web server"));
try {
rws = make_unique<RecursorWebServer>(t_fdm.get());
}
catch (const PDNSException& e) {
SLOG(g_log << Logger::Error << "Unable to start the internal web server: " << e.reason << endl,
log->error(Logr::Critical, e.reason, "Exception while starting internal web server"));
_exit(99);
}
}
#endif
SLOG(g_log << Logger::Info << "Enabled '" << t_fdm->getName() << "' multiplexer" << endl,
log->info(Logr::Info, "Enabled multiplexer", "name", Logging::Loggable(t_fdm->getName())));
}
Expand Down
2 changes: 0 additions & 2 deletions pdns/recursordist/rec-rust-lib/cxxsupport.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1480,8 +1480,6 @@ bool isValidHostname(::rust::Str str)
}
}

void findBetterSolution(const std::unique_ptr<CredentialsHolder>& /* x */){};

std::unique_ptr<ComboAddress> comboaddress(::rust::Str str)
{
return std::make_unique<ComboAddress>(::ComboAddress(std::string(str)));
Expand Down
4 changes: 2 additions & 2 deletions pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ For catalog zone members in a group, the forwarding parameters will be taken fro
The forwarding definitions will be written into a file ``$api_dir/catzone.$zonename``. :ref:`setting-yaml-webservice.api_dir` must be defined, the directory must exist and be writable by the :program:`Recursor` process.

IncomingWSConfig
^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^
As of version 5.3.0, an incoming web server configuration is defined as

.. code-block:: yaml
Expand All @@ -557,7 +557,7 @@ A :ref:`setting-yaml-webservice.listen` section contains a sequence of `Incoming
If no ``tls`` section is present, plaintext ``http`` connections are accepted on the listed addresses.

If a ``tls`` section is present, clienst are required to use ``https`` to contact any of the address-port combinations listen in addresses. At the moment it is not possible to list additional properties of the TLS listener and encrypted key files cannot be used.
If a ``tls`` section is present, clients are required to use ``https`` to contact any of the address-port combinations listen in addresses. At the moment it is not possible to list additional properties of the TLS listener and encrypted key files cannot be used.


The YAML settings
Expand Down
2 changes: 1 addition & 1 deletion pdns/recursordist/rec-rust-lib/rust/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fn main() {
.flag("-I../../..")
.compile("settings");

// lib.rs is genertated an take carte of by parent Makefile
// lib.rs is generated and take care of by parent Makefile
println!("cargo:rerun-if-changed=src/misc.rs");
println!("cargo:rerun-if-changed=src/web.rs");
}

0 comments on commit 6e1bfee

Please sign in to comment.