[libcamera-devel] [PATCH v3] libcamera: log: Expand log level names

Kieran Bingham kieran.bingham at ideasonboard.com
Wed Jan 29 13:10:00 CET 2020


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 at ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---

v3:
 - Rebase to master with Trhead::currentID() section.

v2:
 - Expand commit message
 - Expand spacing before the log severity name is printed.


 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 1c82dc68fb0f..fd1b5c39a52e 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();
-- 
2.20.1



More information about the libcamera-devel mailing list