From: Otto Moerbeek Date: Mon, 13 Jun 2022 13:37:20 +0000 (+0200) Subject: Format X-Git-Tag: auth-4.8.0-alpha0~48^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4155a12b8b7626bf06a0750d3f67ccee7bcc3c61;p=thirdparty%2Fpdns.git Format --- diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc index 7d018010a8..db66ea295f 100644 --- a/pdns/ws-recursor.cc +++ b/pdns/ws-recursor.cc @@ -1368,7 +1368,7 @@ void AsyncWebServer::serveConnection(std::shared_ptr client) const HttpRequest req(logprefix); HttpResponse resp; #ifdef RECURSOR - auto log = d_slog->withValues("uniqueid", Logging::Loggable(to_string(unique))); + auto log = d_slog->withValues("uniqueid", Logging::Loggable(to_string(unique))); req.setSLog(log); resp.setSLog(log); #endif @@ -1409,7 +1409,7 @@ void AsyncWebServer::serveConnection(std::shared_ptr client) const catch (YaHTTP::ParseError& e) { // request stays incomplete SLOG(g_log << Logger::Warning << logprefix << "Unable to parse request: " << e.what() << endl, - req.d_slog->error(Logr::Warning, e.what(), "Unable to parse request")); + req.d_slog->error(Logr::Warning, e.what(), "Unable to parse request")); } logRequest(req, remote); @@ -1440,13 +1440,14 @@ void AsyncWebServer::serveConnection(std::shared_ptr client) const } catch (...) { SLOG(g_log << Logger::Error << logprefix << "Unknown exception" << endl, - req.d_slog->error(Logr::Error, "Exception handing request")) } + req.d_slog->error(Logr::Error, "Exception handing request")) + } if (d_loglevel >= WebServer::LogLevel::Normal) { SLOG(g_log << Logger::Notice << logprefix << remote << " \"" << req.method << " " << req.url.path << " HTTP/" << req.versionStr(req.version) << "\" " << resp.status << " " << reply.size() << endl, req.d_slog->info(Logr::Info, "Request", "remote", Logging::Loggable(remote), "method", Logging::Loggable(req.method), "urlpath", Logging::Loggable(req.url.path), "HTTPVersion", Logging::Loggable(req.versionStr(req.version)), - "status", Logging::Loggable(resp.status), "respsize", Logging::Loggable(reply.size()))); + "status", Logging::Loggable(resp.status), "respsize", Logging::Loggable(reply.size()))); } }