From 1a6d0f5e9a46f7bd32af1a0b2667f14e7911f93d Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Tue, 19 Nov 2019 16:11:33 +0000
Subject: libcamera: log: Expand log level names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When the log severity names were added, there was only 4 characters
reserved for their printing. When the FATAL level was added, this
increased to 5, and thus both DBG and ERR can be expanded to their full
spelling. This also brings the levels in line with the representation
that can be used when calling logSetLevel().
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
src/libcamera/log.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp
index 1c82dc68..fd1b5c39 100644
--- a/src/libcamera/log.cpp
+++ b/src/libcamera/log.cpp
@@ -84,10 +84,10 @@ static int log_severity_to_syslog(LogSeverity severity)
static const char *log_severity_name(LogSeverity severity)
{
static const char *const names[] = {
- " DBG",
+ "DEBUG",
" INFO",
" WARN",
- " ERR",
+ "ERROR",
"FATAL",
};
@@ -198,7 +198,7 @@ void LogOutput::write(const LogMessage &msg)
case LoggingTargetStream:
case LoggingTargetFile:
str = "[" + utils::time_point_to_string(msg.timestamp()) + "] ["
- + std::to_string(Thread::currentId()) + "]"
+ + std::to_string(Thread::currentId()) + "] "
+ log_severity_name(msg.severity()) + " "
+ msg.category().name() + " " + msg.fileInfo() + " "
+ msg.msg();
--
cgit v1.2.1