From d920a5262bd621837076aa69069f2ea224a384ac Mon Sep 17 00:00:00 2001 From: "Evgeny Alekseev (IBS Group)" Date: Thu, 15 Sep 2022 16:19:17 +0300 Subject: IBS: Fix logging brakedown after bmcweb bump --- ...Fix-redfish2phosphor-call-fillMessageArgs.patch | 22 ++++++++++++++++++++++ .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-redfish2phosphor-call-fillMessageArgs.patch diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-redfish2phosphor-call-fillMessageArgs.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-redfish2phosphor-call-fillMessageArgs.patch new file mode 100644 index 0000000000..de517acc65 --- /dev/null +++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Fix-redfish2phosphor-call-fillMessageArgs.patch @@ -0,0 +1,22 @@ +From b23b11d6fddb541a859fa547e34ba0ea0657b660 Mon Sep 17 00:00:00 2001 +From: "Evgeny Alekseev (IBS Group)" +Date: Thu, 15 Sep 2022 15:03:15 +0300 +Subject: [PATCH] Fix redfish2phosphor call fillMessageArgs + +--- + src/redfish2phosphor-logs.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/redfish2phosphor-logs.cpp b/src/redfish2phosphor-logs.cpp +index 1bd51cac..5a19876e 100644 +--- a/src/redfish2phosphor-logs.cpp ++++ b/src/redfish2phosphor-logs.cpp +@@ -190,7 +190,7 @@ int main(int argc, char* argv[]) + + for (auto& m : strsplit_args) + BMCWEB_LOG_DEBUG << m; +- redfish::registries::fillMessageArgs(strsplit_args, string_msg); ++ string_msg = redfish::registries::fillMessageArgs(strsplit_args, string_msg); + BMCWEB_LOG_DEBUG << string_msg; + try + { diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index b0cb53db12..b1fb651cb0 100644 --- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -12,6 +12,7 @@ SRC_URI += "\ file://0007-Add-additional-logs-about-time-sync.patch \ file://0008-Added-additional-log-about-NTP-sync-status.patch \ file://0009-Added-check-user-priv-before-creating-KVM-and-SOL.patch \ + file://0010-Fix-redfish2phosphor-call-fillMessageArgs.patch \ " EXTRA_OEMESON += "\ @@ -19,5 +20,6 @@ EXTRA_OEMESON += "\ -Dredfish-bmc-journal=enabled \ -Drest=enabled \ -Dredfish-dbus-log=enabled \ + -Dbmcweb-logging=enabled \ " -- cgit v1.2.3