From 0e37dcde91afc4c633da40eb47887ec266314733 Mon Sep 17 00:00:00 2001
From: TheMarpe <martin.peterlin7@gmail.com>
Date: Mon, 31 Jul 2023 14:37:42 +0200
Subject: [PATCH] Fixed device related logging

---
 src/device/DeviceBase.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/device/DeviceBase.cpp b/src/device/DeviceBase.cpp
index 96076b747..a2bb2ddcb 100644
--- a/src/device/DeviceBase.cpp
+++ b/src/device/DeviceBase.cpp
@@ -602,6 +602,12 @@ void DeviceBase::init2(Config cfg, const dai::Path& pathToMvcmd, tl::optional<co
     // Apply nonExclusiveMode
     config.board.nonExclusiveMode = config.nonExclusiveMode;
 
+    // Apply device specific logger level
+    {
+        auto deviceLogLevel = config.logLevel.value_or(spdlogLevelToLogLevel(logger::get_level()));
+        setLogOutputLevel(config.outputLogLevel.value_or(deviceLogLevel));
+    }
+
     // Specify expected running mode
     XLinkDeviceState_t expectedBootState = X_LINK_BOOTED;
     if(config.nonExclusiveMode) {
@@ -676,7 +682,7 @@ void DeviceBase::init2(Config cfg, const dai::Path& pathToMvcmd, tl::optional<co
     }
 
     // Get embedded mvcmd or external with applied config
-    if(logger::get_level() == spdlog::level::debug) {
+    if(getLogOutputLevel() <= LogLevel::DEBUG) {
         nlohmann::json jBoardConfig = config.board;
         pimpl->logger.debug("Device - BoardConfig: {} \nlibnop:{}", jBoardConfig.dump(), spdlog::to_hex(utility::serialize(config.board)));
     }
@@ -738,7 +744,7 @@ void DeviceBase::init2(Config cfg, const dai::Path& pathToMvcmd, tl::optional<co
         std::unique_lock<std::mutex> lock(pimpl->rpcMutex);
 
         // Log the request data
-        if(logger::get_level() == spdlog::level::trace) {
+        if(getLogOutputLevel() == LogLevel::TRACE) {
             pimpl->logger.trace("RPC: {}", nlohmann::json::from_msgpack(request).dump());
         }
 
@@ -821,7 +827,6 @@ void DeviceBase::init2(Config cfg, const dai::Path& pathToMvcmd, tl::optional<co
     try {
         auto level = spdlogLevelToLogLevel(logger::get_level());
         setLogLevel(config.logLevel.value_or(level));
-        setLogOutputLevel(config.outputLogLevel.value_or(level));
 
         // Sets system inforation logging rate. By default 1s
         setSystemInformationLoggingRate(DEFAULT_SYSTEM_INFORMATION_LOGGING_RATE_HZ);
@@ -1367,7 +1372,7 @@ bool DeviceBase::startPipelineImpl(const Pipeline& pipeline) {
     pipeline.serialize(schema, assets, assetStorage);
 
     // if debug or lower
-    if(logger::get_level() <= spdlog::level::debug) {
+    if(getLogOutputLevel() <= LogLevel::DEBUG) {
         nlohmann::json jSchema = schema;
         pimpl->logger.debug("Schema dump: {}", jSchema.dump());
         nlohmann::json jAssets = assets;