commit a782e2650fdcabb23dd140593b2fcec366a73258
author Alexander Hansen <alexander.hansen@9elements.com> Mon Aug 12 14:04:06 2024 +0200
committer Alexander <alexander.hansen@9elements.com> Thu Aug 15 19:52:27 2024 +0000
tree 6bae9655e32cb0d1e99cb2cfdfcc481e69b2cf1b
parent 898f2aa2ae96fc2ded1faf1149e555abd5407e7f

event logs: move route requests

The alternative routes declared depending on BMCWEB_REDFISH_DBUS_LOG can
be closer together. This makes the route declarations more readable.

Tested: no, simple code move

Change-Id: Ia296a3391cc8476b4fa4a1198a7005aab000b4fa
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>

redfish-core/src/redfish.cpp

diff --git a/redfish-core/src/redfish.cpp b/redfish-core/src/redfish.cpp
index 3cda4ec..e1e5ff1 100644
--- a/redfish-core/src/redfish.cpp
+++ b/redfish-core/src/redfish.cpp
@@ -136,13 +136,6 @@
         requestRoutesFaultLogDumpClear(app);
     }
 
-    if constexpr (!BMCWEB_REDFISH_DBUS_LOG)
-    {
-        requestRoutesJournalEventLogEntryCollection(app);
-        requestRoutesJournalEventLogEntry(app);
-        requestRoutesJournalEventLogClear(app);
-    }
-
     requestRoutesBMCLogServiceCollection(app);
 
     if constexpr (BMCWEB_REDFISH_BMC_JOURNAL)
@@ -184,6 +177,12 @@
         requestRoutesDBusEventLogEntry(app);
         requestRoutesDBusEventLogEntryDownload(app);
     }
+    else
+    {
+        requestRoutesJournalEventLogEntryCollection(app);
+        requestRoutesJournalEventLogEntry(app);
+        requestRoutesJournalEventLogClear(app);
+    }
 
     if constexpr (BMCWEB_REDFISH_HOST_LOGGER)
     {