commit c621786ea25e9a82187a52a95e9810cf989ace72
author Ed Tanous <etanous@nvidia.com> Mon Nov 24 11:47:24 2025 -0800
committer Ed Tanous <ed@tanous.net> Tue Nov 25 21:06:20 2025 +0000
tree 9af63d0d2aafc8778fabf64ee03647e6c25877c2
parent e5ab2df5a5c865719cf6111bea549ffa84801d7e

Combine handlers

Fix one comment made on [1] to combine method calls into a single one.

Tested: Unit tests pass, @Oliver Brewka need your help to sanity check
this.

[1] https://gerrit.openbmc.org/c/openbmc/bmcweb/+/83355

Change-Id: Iad90d57c6cd0fe3926186f238aba887b88e99c12
Signed-off-by: Ed Tanous <etanous@nvidia.com>

redfish-core/lib/manager_logservices_dbus_eventlog.hpp

diff --git a/redfish-core/lib/manager_logservices_dbus_eventlog.hpp b/redfish-core/lib/manager_logservices_dbus_eventlog.hpp
index ac2842d..a1e4726 100644
--- a/redfish-core/lib/manager_logservices_dbus_eventlog.hpp
+++ b/redfish-core/lib/manager_logservices_dbus_eventlog.hpp
@@ -146,17 +146,13 @@
     eventlog_utils::downloadEventLogEntry(asyncResp, entryId, "System");
 }
 
-inline void requestRoutesManagersDBusEventLogEntryCollection(App& app)
+inline void requestRoutesManagersDBusEventLog(App& app)
 {
     BMCWEB_ROUTE(app,
                  "/redfish/v1/Managers/<str>/LogServices/EventLog/Entries/")
         .privileges(redfish::privileges::getLogEntryCollection)
         .methods(boost::beast::http::verb::get)(std::bind_front(
             handleManagersDBusEventLogEntryCollection, std::ref(app)));
-}
-
-inline void requestRoutesManagersDBusEventLogEntry(App& app)
-{
     BMCWEB_ROUTE(
         app, "/redfish/v1/Managers/<str>/LogServices/EventLog/Entries/<str>/")
         .privileges(redfish::privileges::getLogEntry)
@@ -176,18 +172,6 @@
                 deleteLogEntrySubOverComputerSystemLogServiceCollectionLogServiceLogEntryCollection)
         .methods(boost::beast::http::verb::delete_)(std::bind_front(
             handleManagersDBusEventLogEntryDelete, std::ref(app)));
-}
-
-/**
- * DBusLogServiceActionsClear class supports POST method for ClearLog action.
- */
-inline void requestRoutesManagersDBusLogServiceActionsClear(App& app)
-{
-    /**
-     * Function handles POST method request.
-     * The Clear Log actions does not require any parameter.The action deletes
-     * all entries found in the Entries collection for this Log Service.
-     */
 
     BMCWEB_ROUTE(
         app,
@@ -196,10 +180,6 @@
                         postLogServiceSubOverComputerSystemLogServiceCollection)
         .methods(boost::beast::http::verb::post)(std::bind_front(
             handleManagersDBusLogServiceActionsClear, std::ref(app)));
-}
-
-inline void requestRoutesManagersDBusEventLogEntryDownload(App& app)
-{
     BMCWEB_ROUTE(
         app,
         "/redfish/v1/Managers/<str>/LogServices/EventLog/Entries/<str>/attachment/")

redfish-core/src/redfish.cpp

diff --git a/redfish-core/src/redfish.cpp b/redfish-core/src/redfish.cpp
index 5b0ed85..b176593 100644
--- a/redfish-core/src/redfish.cpp
+++ b/redfish-core/src/redfish.cpp
@@ -142,10 +142,7 @@
         requestRoutesManagersEventLogService(app);
         if constexpr (BMCWEB_REDFISH_DBUS_LOG)
         {
-            requestRoutesManagersDBusLogServiceActionsClear(app);
-            requestRoutesManagersDBusEventLogEntryCollection(app);
-            requestRoutesManagersDBusEventLogEntry(app);
-            requestRoutesManagersDBusEventLogEntryDownload(app);
+            requestRoutesManagersDBusEventLog(app);
         }
         else
         {