diff --git a/include/triton/common/logging.h b/include/triton/common/logging.h index 8ffbe50..2b59e55 100644 --- a/include/triton/common/logging.h +++ b/include/triton/common/logging.h @@ -70,7 +70,6 @@ class LogMessage { private: static const std::array LEVEL_NAMES_; - static const std::vector level_name_; std::string path_; const int line_; const uint32_t level_; diff --git a/src/logging.cc b/src/logging.cc index a1000b6..bad4d5a 100644 --- a/src/logging.cc +++ b/src/logging.cc @@ -75,7 +75,7 @@ Logger::Flush() } const std::array - LogMessage::LEVEL_NAMES_{"Error", "Warning", "Info"}; + LogMessage::LEVEL_NAMES_{"ERROR", "WARNING", "INFO"}; const std::vector LogMessage::level_name_{'E', 'W', 'I'}; #ifdef _WIN32 @@ -189,11 +189,14 @@ LogMessage::~LogMessage() case Logger::Format::kJSONL: { TritonJson::Value logMessage(TritonJson::ValueType::OBJECT); TritonJson::WriteBuffer buffer; + std::stringstream timestamp; + LogTimestamp(timestamp); logMessage.AddString("file", path_); logMessage.AddInt("line", line_); logMessage.AddString("level", LEVEL_NAMES_[level_]); - logMessage.AddInt("pid", pid_); + logMessage.AddInt("process_id", pid_); logMessage.AddString("message", message_.str()); + logMessage.AddString("timestamp", timestamp.str()); logMessage.Write(&buffer); gLogger_.Log(buffer.Contents()); break;