From patchwork Fri Apr 1 09:03:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15610 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0194AC3256 for ; Fri, 1 Apr 2022 09:03:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5436A633A5; Fri, 1 Apr 2022 11:03:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648803795; bh=s7zWsB4hIYlYqBlFxjWym9iaezZU1/zL5w6m496pYmc=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=I4cmm1PMjA1HiNIUOw7h70DpX3/mCQ7+oCNivJ8yFrWR09DNCholk44CTZC99Wpq9 RVfSw6RFTIDs04HlHfRLdOPAntBYZ1QwqUB8ux8iTHHiRSjorI6ohTJ+wIMcFO7xE2 ZrNjHhotWLrpTmOSe3hFNVSZUkL/Z0o+kRmPW/UavnhjyciVvaP6ZesbZo/AeeYhOk oWa9+3IAXIgii1UwMd1z/aY2l1oXg12VkqXXabHm5G2xYM+MlmWjGguYfp3zwuNH5l rulCv/yTeTyidugw38xZtHBbmvN/gutEzk5RHld5BwKL9B1ki5XAfCpEZwPc6sI19P mNuJdjGF2dQvw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A86A604B9 for ; Fri, 1 Apr 2022 11:03:13 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iD3jDT5V"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0924B486; Fri, 1 Apr 2022 11:03:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648803793; bh=s7zWsB4hIYlYqBlFxjWym9iaezZU1/zL5w6m496pYmc=; h=From:To:Cc:Subject:Date:From; b=iD3jDT5VUR+g+FUMauYA9VlV0GC1KyDgDIqUag59xqMKe94vgQoK3vtII5lWOeAds RMXF7f23xAxGdLprWVOjul12LaRLWul1kt7vFRJLhzzxwmhul5RQsjClW38CZRuoTF utlcIZRHzVOh4Hbi519BsxpnV9H6MWBMlSeWyAZU= To: libcamera devel Date: Fri, 1 Apr 2022 10:03:09 +0100 Message-Id: <20220401090309.2704921-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: base: log: Use emoji's in log output X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Our debug logs are already growing terse and difficult to parse with the eye. The specific notifications can easily blend into each other. Add some highlight and colour to the log messages by replacing the log severity levels with emoji characters which convey the same meaning but in much less space. Syslog and output to files remains unchanged. Only stream outputs display emoji symbols. Signed-off-by: Kieran Bingham Reviewed-by: Umang Jain --- src/libcamera/base/log.cpp | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp index 64813b6607c5..aceec7302549 100644 --- a/src/libcamera/base/log.cpp +++ b/src/libcamera/base/log.cpp @@ -96,6 +96,23 @@ static const char *log_severity_name(LogSeverity severity) return "UNKWN"; } +static const std::string &log_severity_emojis(LogSeverity severity) +{ + static const std::string emojis[] = { + "đŸĒ˛ ", // DEBUG + "ℹī¸ ", // INFO + "⚠ī¸ ", // WARNING + "đŸ”Ĩ ", // ERROR + "🆘 ", // FATAL + "🤔 ", // Unknown + }; + + if (static_cast(severity) < std::size(emojis)) + return emojis[severity]; + else + return emojis[std::size(emojis) - 1]; +} + /** * \brief Log output * @@ -194,7 +211,6 @@ void LogOutput::write(const LogMessage &msg) + msg.msg(); writeSyslog(msg.severity(), str); break; - case LoggingTargetStream: case LoggingTargetFile: str = "[" + utils::time_point_to_string(msg.timestamp()) + "] [" + std::to_string(Thread::currentId()) + "] " @@ -203,6 +219,13 @@ void LogOutput::write(const LogMessage &msg) + msg.msg(); writeStream(str); break; + case LoggingTargetStream: + str = "[" + utils::time_point_to_string(msg.timestamp()) + "] [" + + std::to_string(Thread::currentId()) + "] " + + log_severity_emojis(msg.severity()) + " " + + msg.category().name() + " " + msg.fileInfo() + " " + + msg.msg(); + writeStream(str); default: break; }