diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-06-07 06:59:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 06:59:15 +0300 |
| commit | 5575b1d27fc222f973d96dc06af0f21ba7656f28 (patch) | |
| tree | 6d29c0a7edc3769c9fbba0a3c6f6ed9ba10ba8ed /meta-openbmc-mods/meta-common/recipes-phosphor/watchdog | |
| parent | 4aa406adc1accd959bf64d299d750e8b2083ace3 (diff) | |
| parent | 10bc2ef852277cf8e9858f75cea9f55b482bf85b (diff) | |
| download | openbmc-5575b1d27fc222f973d96dc06af0f21ba7656f28.tar.xz | |
Merge pull request #10 from Intel-BMC/update
Update
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/watchdog')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch index 6e057f681..28995d14b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch @@ -1,4 +1,4 @@ -From 1c0e658833ea7595b2fb42261ce5e0ce781bac98 Mon Sep 17 00:00:00 2001 +From 38faf5c040660e752741dcf7f03e4bb1e9f3411b Mon Sep 17 00:00:00 2001 From: Yong Li <yong.b.li@linux.intel.com> Date: Thu, 4 Apr 2019 18:24:54 +0800 Subject: [PATCH] Add redfish log support for IPMI watchdog timeout actions @@ -17,11 +17,11 @@ https://BMCIP/redfish/v1/Systems/system/LogServices/EventLog/Entries Signed-off-by: Yong Li <yong.b.li@linux.intel.com> --- - watchdog.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) + watchdog.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/watchdog.cpp b/watchdog.cpp -index d529746..008cde5 100644 +index bc3ba95..4774fd8 100644 --- a/watchdog.cpp +++ b/watchdog.cpp @@ -1,5 +1,7 @@ @@ -32,19 +32,20 @@ index d529746..008cde5 100644 #include <chrono> #include <phosphor-logging/elog.hpp> #include <phosphor-logging/log.hpp> -@@ -115,6 +117,12 @@ void Watchdog::timeOutHandler() - entry("ACTION=%s", convertForMessage(action).c_str()), - entry("TARGET=%s", target->second.c_str())); +@@ -101,6 +103,13 @@ void Watchdog::timeOutHandler() + action = fallback->action; + } -+ // Log into redfish event log -+ sd_journal_send("MESSAGE=IPMIWatchdog: Timed out ACTION=%s; TARGET=%s", -+ convertForMessage(action).c_str(), -+ target->second.c_str(), "PRIORITY=%i", LOG_INFO, -+ "REDFISH_MESSAGE_ID=%s", "IPMIWatchdog", NULL); ++ // Log into redfish event log ++ sd_journal_send("MESSAGE=IPMIWatchdog: Timed out ACTION=%s", ++ convertForMessage(action).c_str(), "PRIORITY=%i", LOG_INFO, ++ "REDFISH_MESSAGE_ID=%s", "OpenBMC.0.1.IPMIWatchdog", ++ "REDFISH_MESSAGE_ARGS=%s", ++ convertForMessage(action).c_str(), NULL); + - try - { - auto method = bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_ROOT, + expiredTimerUse(currentTimerUse()); + + auto target = actionTargetMap.find(action); -- 2.7.4 |