Update logger initialization

uweseimet · Jan 2, 2025 · db2948f · db2948f
1 parent 1fa0763
commit db2948f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/cpp/base/device.cpp b/cpp/base/device.cpp
@@ -37,7 +37,7 @@ void Device::SetParams(const param_map &set_params)
             params[key] = value;
         }
         else {
-            GetLogger().warn("{0} ignored unknown parameter '{1}={2}'", PbDeviceType_Name(type), key, value);
+            device_logger->warn("{0} ignored unknown parameter '{1}={2}'", PbDeviceType_Name(type), key, value);
         }
     }
 }
@@ -81,13 +81,13 @@ bool Device::Eject(bool force)
     return true;
 }
 
-logger& Device::GetLogger()
+void Device::CreateLogger()
 {
-    if (!logger_initialized) {
-        device_logger = s2p_util::CreateLogger(fmt::format("[s2p] (ID:LUN {0}:{1})", GetId(), GetLun()));
-        logger_initialized = true;
-    }
+    device_logger = s2p_util::CreateLogger(fmt::format("[s2p] (ID:LUN {0}:{1})", GetId(), GetLun()));
+}
 
+logger& Device::GetLogger() const
+{
     return *device_logger;
 }
 

diff --git a/cpp/base/device.h b/cpp/base/device.h
@@ -118,7 +118,7 @@ class Device // NOSONAR The number of fields and methods is justified, the compl
     void Stop();
     virtual bool Eject(bool);
 
-    logger& GetLogger();
+    logger& GetLogger() const;
 
 protected:
 
@@ -162,6 +162,7 @@ class Device // NOSONAR The number of fields and methods is justified, the compl
 
     string GetParam(const string&) const;
 
+    void CreateLogger();
     void LogTrace(const string&) const;
     void LogDebug(const string&) const;
     void LogWarn(const string&) const;
@@ -193,11 +194,9 @@ class Device // NOSONAR The number of fields and methods is justified, the compl
 
     bool supports_params = false;
 
-    bool logger_initialized = false;
-
     // The parameters the device was created with
     param_map params;
 
-    // Use the default logger until the device-specific logger has been initialized
+    // Use the default logger until the device-specific logger has been created
     shared_ptr<logger> device_logger = default_logger();
 };
diff --git a/cpp/base/primary_device.cpp b/cpp/base/primary_device.cpp
@@ -186,6 +186,8 @@ bool PrimaryDevice::SetResponseDataFormat(ScsiLevel l)
 void PrimaryDevice::SetController(AbstractController *c)
 {
     controller = c;
+
+    CreateLogger();
 }
 
 void PrimaryDevice::StatusPhase() const