From 02e19db53932bb8714df03fa92fe601408aeac69 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sat, 18 Nov 2023 16:09:59 +0100 Subject: [PATCH] Fix missing logging for a LUN when the LUN is explicitly specified --- cpp/devices/device_logger.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cpp/devices/device_logger.cpp b/cpp/devices/device_logger.cpp index 65afb129..0ccf235d 100644 --- a/cpp/devices/device_logger.cpp +++ b/cpp/devices/device_logger.cpp @@ -39,16 +39,14 @@ void DeviceLogger::Error(const string& message) const void DeviceLogger::Log(level::level_enum level, const string& message) const { - if (!message.empty() && - (log_device_id == -1 || - (log_device_id == id && (log_device_lun == -1 || log_device_lun == lun)))) { - if (lun == -1) { - log(level, "(ID " + to_string(id) + ") - " + message); - } - else { - log(level, "(ID:LUN " + to_string(id) + ":" + to_string(lun) + ") - " + message); - } - } + if ((log_device_id == -1 || log_device_id == id) && (log_device_lun == -1 || log_device_lun == lun)) { + if (lun == -1) { + log(level, "(ID " + to_string(id) + ") - " + message); + } + else { + log(level, "(ID:LUN " + to_string(id) + ":" + to_string(lun) + ") - " + message); + } + } } void DeviceLogger::SetIdAndLun(int i, int l)