From c23dfdd8c3ed6a2bec38fb1aee017305ba201664 Mon Sep 17 00:00:00 2001 From: Tim Bruijnzeels Date: Mon, 10 May 2021 16:12:10 +0200 Subject: [PATCH] Change HTTP Log to debug, unless KRILL_HTTP_LOG_INFO is set. (#513) --- src/constants.rs | 1 + src/daemon/http/server.rs | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/constants.rs b/src/constants.rs index e4fd7219..54f3b539 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -21,6 +21,7 @@ pub const KRILL_ENV_LOG_LEVEL: &str = "KRILL_LOG_LEVEL"; pub const KRILL_ENV_ADMIN_TOKEN: &str = "KRILL_ADMIN_TOKEN"; pub const KRILL_ENV_ADMIN_TOKEN_DEPRECATED: &str = "KRILL_AUTH_TOKEN"; pub const KRILL_ENV_SERVER_PORT: &str = "KRILL_SERVER_PORT"; +pub const KRILL_ENV_HTTP_LOG_INFO: &str = "KRILL_HTTP_LOG_INFO"; pub fn enable_test_mode() { std::env::set_var(KRILL_ENV_TEST, "1"); diff --git a/src/daemon/http/server.rs b/src/daemon/http/server.rs index b060b55a..3ae32f52 100644 --- a/src/daemon/http/server.rs +++ b/src/daemon/http/server.rs @@ -21,10 +21,10 @@ use hyper::server::conn::AddrIncoming; use hyper::service::{make_service_fn, service_fn}; use hyper::Method; -use crate::commons::api::{ +use crate::{commons::api::{ BgpStats, ChildHandle, CommandHistoryCriteria, Handle, ParentCaContact, ParentHandle, PublisherList, RoaDefinitionUpdates, RtaName, Token, -}; +}, constants::KRILL_ENV_HTTP_LOG_INFO}; use crate::commons::api::{ParentCaReq, RepositoryContact}; use crate::commons::bgp::BgpAnalysisAdvice; use crate::commons::error::Error; @@ -176,8 +176,12 @@ impl RequestLogger { _ => {} } - info!("{} {} {}", self.req_method, self.req_path, response.status()); - + if env::var(KRILL_ENV_HTTP_LOG_INFO).is_ok() { + info!("{} {} {}", self.req_method, self.req_path, response.status()); + } else { + debug!("{} {} {}", self.req_method, self.req_path, response.status()); + } + if response.loggable() && log_enabled!(log::Level::Trace) { trace!("Response: headers={:?} body={:?}", response.headers(), response.body()); }