add smtp logging

update smtp

3 files changed, 33 insertions, 1 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch
new file mode 100644
index 0000000000..ea77f73844
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0019-add-smtp-logging.patch
@@ -0,0 +1,29 @@
+From 20d0e08bebfb7d4f5001413ce512cf6a98ecef71 Mon Sep 17 00:00:00 2001
+From: claiff <claiff@mail.ru>
+Date: Fri, 23 Sep 2022 16:18:09 +0300
+Subject: [PATCH] add smtp logging
+
+---
+ .../include/registries/openbmc_message_registry.hpp      | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
+index 33058a80..7dea3fac 100644
+--- a/redfish-core/include/registries/openbmc_message_registry.hpp
++++ b/redfish-core/include/registries/openbmc_message_registry.hpp
+@@ -2170,6 +2170,15 @@ constexpr std::array registry = {
+                      {"string"},
+                      "None.",
+                  }},
++    MessageEntry{"SMTPError",
++                 {
++                     "Special error SMTP",
++                     "SMTP manager error in method: %1, with message: \"%2\"",
++                     "Critical",
++                     2,
++                     {"string", "string"},
++                     "None.",
++                 }},
+     MessageEntry{"SparingRedundancyDegraded",
+                  {
+                      "Indicates the sparing redundancy state is degraded.",
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 93fbcfdfaf..b4fa895829 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -15,6 +15,7 @@ SRC_URI += "\
     file://0016-Redfish-implement-Syslog-config.patch \
 	file://0017-update-smtp.patch \
 	file://0018-add-timezone.patch \
+	file://0019-add-smtp-logging.patch \
     "
 
 #SRC_URI += "\
diff --git a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb b/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb
index 0e3e72ce9c..16ab8aa424 100644
--- a/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb
+++ b/meta-ibs/meta-cp2-5422/recipes-support/smtp/smtp.bb
@@ -8,7 +8,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 SRC_URI = "git://git@git.sila.ru/srv/pub/scm/git/openbmc/obmc-sila-smtp.git;branch=master;protocol=ssh"
-SRCREV = "629929ebbe386277c25740bc0f4971aac38444d0"
+SRCREV = "8d38861429c3544d10752fb0f6f9da436dee218f"
 
 S = "${WORKDIR}/git"
 
@@ -24,6 +24,8 @@ do_install:append() {
 
 inherit cmake systemd pkgconfig
 
+EXTRA_OECMAKE += "-DADD_PHOSPHOR_LOGGING=ON"
+
 DEPENDS = "boost \
            systemd \
            sdbusplus \