summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2019-11-19 16:11:33 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2020-01-31 14:56:22 +0000
commit1a6d0f5e9a46f7bd32af1a0b2667f14e7911f93d (patch)
treed74c031dda81f2a78c0d60bc651b181c5e068e35
parent4b44f61c53b2f29bc3f6cec3aa2f5242ecd18ebf (diff)
libcamera: log: Expand log level names
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>
-rw-r--r--src/libcamera/log.cpp6
1 files 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();