From 7aaf2c8f7ac4d28fb5ee343c0d264f0399765898 Mon Sep 17 00:00:00 2001 From: t-horikawa Date: Fri, 1 Nov 2024 15:37:52 +0900 Subject: [PATCH] use ::altimeter::logger::set_level() in src/tateyama/altimeter/service/core --- src/tateyama/altimeter/service/core.cpp | 25 ++++--------------------- src/tateyama/altimeter/service/core.h | 3 +-- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/tateyama/altimeter/service/core.cpp b/src/tateyama/altimeter/service/core.cpp index 3788f5d1..b18e1b99 100644 --- a/src/tateyama/altimeter/service/core.cpp +++ b/src/tateyama/altimeter/service/core.cpp @@ -33,13 +33,8 @@ using tateyama::api::server::response; class altimeter_helper_direct : public altimeter_helper { public: - void enable(std::string_view) override { - // FIXME not implemented in altimeter - // ::altimeter::logger::enable(t); - } - void disable(std::string_view) override { - // FIXME not implemented in altimeter - // ::altimeter::logger::disable(t); + void set_enabled(std::string_view t, const bool& v) override { + ::altimeter::logger::set_level(t, v); } void set_level(std::string_view t, std::uint64_t v) override { ::altimeter::logger::set_level(t, v); @@ -69,13 +64,7 @@ bool tateyama::altimeter::service::core::operator()(const std::shared_ptrenable("event"); - } else { - helper_->disable("event"); - } - send_error(res, tateyama::proto::altimeter::response::ErrorKind::UNKNOWN, "event log [enable|disable] is not implemented"); // FIXME remove this and the following lines - return true; // Error notification is treated as normal termination. + helper_->set_enabled("event", log_settings.enabled()); } if (log_settings.level_opt_case() == tateyama::proto::altimeter::request::LogSettings::LevelOptCase::kLevel) { auto v = log_settings.level(); @@ -89,13 +78,7 @@ bool tateyama::altimeter::service::core::operator()(const std::shared_ptrenable("audit"); - } else { - helper_->disable("audit"); - } - send_error(res, tateyama::proto::altimeter::response::ErrorKind::UNKNOWN, "audit log [enable|disable] is not implemented"); // FIXME remove this and the following lines - return true; // Error notification is treated as normal termination. + helper_->set_enabled("audit", log_settings.enabled()); } if (log_settings.level_opt_case() == tateyama::proto::altimeter::request::LogSettings::LevelOptCase::kLevel) { auto v = log_settings.level(); diff --git a/src/tateyama/altimeter/service/core.h b/src/tateyama/altimeter/service/core.h index b61ea707..92817341 100644 --- a/src/tateyama/altimeter/service/core.h +++ b/src/tateyama/altimeter/service/core.h @@ -31,8 +31,7 @@ using tateyama::api::server::response; */ class altimeter_helper { public: - virtual void enable(std::string_view) = 0; - virtual void disable(std::string_view) = 0; + virtual void set_enabled(std::string_view, const bool&)= 0; virtual void set_level(std::string_view, std::uint64_t) = 0; virtual void set_stmt_duration_threshold(std::uint64_t) = 0; virtual void rotate_all(std::string_view) = 0;