use ::altimeter::logger::set_level() in src/tateyama/altimeter/servic…

…e/core
project-tsurugi · Nov 1, 2024 · 7aaf2c8 · 7aaf2c8 · t-horikawa · Nov 1, 2024
1 parent e240792
commit 7aaf2c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git 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_ptr<reques
         if (configure.has_event_log()) {
             auto log_settings = configure.event_log();
             if (log_settings.enabled_opt_case() == tateyama::proto::altimeter::request::LogSettings::EnabledOptCase::kEnabled) {
-                if (log_settings.enabled()) {
-                    helper_->enable("event");
-                } else {
-                    helper_->disable("event");
-                }
-                send_error<tateyama::proto::altimeter::response::Configure>(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_ptr<reques
         if (configure.has_audit_log()) {
             auto log_settings = configure.audit_log();
             if (log_settings.enabled_opt_case() == tateyama::proto::altimeter::request::LogSettings::EnabledOptCase::kEnabled) {
-                if (log_settings.enabled()) {
-                    helper_->enable("audit");
-                } else {
-                    helper_->disable("audit");
-                }
-                send_error<tateyama::proto::altimeter::response::Configure>(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
@@ -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;