From abaac41f1b75ce2200f6acadba1aa36d9577f8cb Mon Sep 17 00:00:00 2001 From: hai007 Date: Thu, 25 Mar 2021 06:52:48 -0700 Subject: [PATCH] Internal change PiperOrigin-RevId: 365026440 --- cpp/platform/api/log_message.h | 4 ++++ cpp/platform/base/logging.h | 5 ++++- cpp/platform/impl/g3/log_message.cc | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cpp/platform/api/log_message.h b/cpp/platform/api/log_message.h index 11374ed1..3f43c0bc 100644 --- a/cpp/platform/api/log_message.h +++ b/cpp/platform/api/log_message.h @@ -23,9 +23,13 @@ namespace api { // A log message that prints to appropraite destination when ~LogMessage() is // called. +// +// note: the Severity enum should map (best effort) to the corresponding level +// id that the platform logging implementation has. class LogMessage { public: enum class Severity { + kVerbose = -1, kInfo = 0, kWarning = 1, kError = 2, diff --git a/cpp/platform/base/logging.h b/cpp/platform/base/logging.h index c50e57ce..36a6416c 100644 --- a/cpp/platform/base/logging.h +++ b/cpp/platform/base/logging.h @@ -36,7 +36,10 @@ class LogMessageVoidify { } // namespace location // Severity enum conversion -#define NEARBY_SEVERITY_INFO location::nearby::api::LogMessage::Severity::kInfo +#define NEARBY_SEVERITY_VERBOSE \ + location::nearby::api::LogMessage::Severity::kVerbose +#define NEARBY_SEVERITY_INFO \ + location::nearby::api::LogMessage::Severity::kInfo #define NEARBY_SEVERITY_WARNING \ location::nearby::api::LogMessage::Severity::kWarning #define NEARBY_SEVERITY_ERROR \ diff --git a/cpp/platform/impl/g3/log_message.cc b/cpp/platform/impl/g3/log_message.cc index b227392a..dd63c332 100644 --- a/cpp/platform/impl/g3/log_message.cc +++ b/cpp/platform/impl/g3/log_message.cc @@ -26,6 +26,10 @@ api::LogMessage::Severity g_min_log_severity = api::LogMessage::Severity::kInfo; inline absl::LogSeverity ConvertSeverity(api::LogMessage::Severity severity) { switch (severity) { + // api::LogMessage::Severity kVerbose and kInfo is mapped to + // absl::LogSeverity kInfo since absl::LogSeverity doesn't have kVerbose + // level. + case api::LogMessage::Severity::kVerbose: case api::LogMessage::Severity::kInfo: return absl::LogSeverity::kInfo; case api::LogMessage::Severity::kWarning: