From f6565dfef67a5876331a836ade59f230080c7982 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 5 May 2022 11:36:34 -0400 Subject: [PATCH] rgw: add 'rgw_access' log subsys for frontend http access log this allows the log level of this http access log to be configured separately from the 'rgw' subsystem, though the defaults are the same Fixes: https://tracker.ceph.com/issues/54405 Signed-off-by: Casey Bodley --- PendingReleaseNotes | 3 +++ src/common/subsys.h | 1 + src/rgw/rgw_asio_frontend.cc | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index b6bb34ea75ef2..e5ae265d97928 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -43,6 +43,9 @@ * system * truncated * user_stats_sync +* RGW: The beast frontend's HTTP access log line uses a new debug_rgw_access + configurable. This has the same defaults as debug_rgw, but can now be controlled + independently. >=17.2.1 diff --git a/src/common/subsys.h b/src/common/subsys.h index 7155ca7c3d5f4..a1d95722b304c 100644 --- a/src/common/subsys.h +++ b/src/common/subsys.h @@ -61,6 +61,7 @@ SUBSYS(perfcounter, 1, 5) SUBSYS(rgw, 1, 5) // log level for the Rados gateway SUBSYS(rgw_sync, 1, 5) SUBSYS(rgw_datacache, 1, 5) +SUBSYS(rgw_access, 1, 5) SUBSYS(javaclient, 1, 5) SUBSYS(asok, 1, 5) SUBSYS(throttle, 1, 1) diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc index 2d6e3a3259eed..5bd6bd1adc176 100644 --- a/src/rgw/rgw_asio_frontend.cc +++ b/src/rgw/rgw_asio_frontend.cc @@ -273,7 +273,7 @@ void handle_connection(boost::asio::io_context& context, if (cct->_conf->subsys.should_gather(dout_subsys, 1)) { // access log line elements begin per Apache Combined Log Format with additions following - ldout(cct, 1) << "beast: " << std::hex << &req << std::dec << ": " + lsubdout(cct, rgw_access, 1) << "beast: " << std::hex << &req << std::dec << ": " << remote_endpoint.address() << " - " << user << " [" << log_apache_time{started} << "] \"" << message.method_string() << ' ' << message.target() << ' ' << http_version{message.version()} << "\" " << http_ret << ' ' -- 2.47.3