monitor: Rearrange FFDC section in error log
Place the fan sensor capture data before the journal data in the FFDC
file list so that if there is a space issue in the event log the fan
sensor data will still be completely captured as it is usually more
important.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Icb054103bbd79a1716f5ac8b5cf9ef6e3378c855
diff --git a/monitor/fan_error.cpp b/monitor/fan_error.cpp
index 488bab4..ccbba4e 100644
--- a/monitor/fan_error.cpp
+++ b/monitor/fan_error.cpp
@@ -91,13 +91,6 @@
ffdc.emplace_back(FFDCFormat::Text, 0x01, 0x01, logFile->fd());
}
- // add the previous systemd journal entries as FFDC
- auto serviceFFDC = makeJsonFFDCFile(getJournalEntries(25));
- if (serviceFFDC && serviceFFDC->fd() != -1)
- {
- ffdc.emplace_back(FFDCFormat::JSON, 0x01, 0x01, serviceFFDC->fd());
- }
-
// Add the passed in JSON as FFDC
auto ffdcFile = makeJsonFFDCFile(jsonFFDC);
if (ffdcFile && (ffdcFile->fd() != -1))
@@ -105,6 +98,13 @@
ffdc.emplace_back(FFDCFormat::JSON, 0x01, 0x01, ffdcFile->fd());
}
+ // add the previous systemd journal entries as FFDC
+ auto serviceFFDC = makeJsonFFDCFile(getJournalEntries(25));
+ if (serviceFFDC && serviceFFDC->fd() != -1)
+ {
+ ffdc.emplace_back(FFDCFormat::JSON, 0x01, 0x01, serviceFFDC->fd());
+ }
+
try
{
auto sev = _severity;