diff options
| author | Ed Tanous <ed@tanous.net> | 2024-05-10 01:48:09 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2024-05-10 02:16:06 +0300 |
| commit | 83328316857b42960edd46cadf06902d2d4ba00b (patch) | |
| tree | 1329cd1fe0eb4084411f8d9459a52f8cf3f0ed14 /redfish-core | |
| parent | 3eaecac33685ca3297d53e041ab5c5116bc18d25 (diff) | |
| download | bmcweb-83328316857b42960edd46cadf06902d2d4ba00b.tar.xz | |
Fix lesser used options
25b54dba775b31021a3a4677eb79e9771bcb97f7 missed several cases where we
had ifndef instead of ifdef. because these weren't the defaults, these
don't show up as failures when testing.
Tested: Redfish service validator passes. Inspection primarily.
Mechanical change.
Change-Id: I3f6915a97eb44d071795aed76476c6bee7e8ed27
Signed-off-by: Ed Tanous <ed@tanous.net>
Diffstat (limited to 'redfish-core')
| -rw-r--r-- | redfish-core/include/event_service_manager.hpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp index 702ca268fd..2ea7430072 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -60,7 +60,6 @@ static constexpr const char* eventServiceFile = static constexpr const uint8_t maxNoOfSubscriptions = 20; static constexpr const uint8_t maxNoOfSSESubscriptions = 10; -#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) static std::optional<boost::asio::posix::stream_descriptor> inotifyConn; static constexpr const char* redfishEventLogDir = "/var/log"; @@ -258,7 +257,6 @@ inline int formatEventLogEntry(const std::string& logEntryID, } } // namespace event_log -#endif inline bool isFilterQuerySpecialChar(char c) { @@ -426,7 +424,6 @@ class Subscription : public persistent_data::UserSubscription return sendEvent(std::move(strMsg)); } -#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES void filterAndSendEventLogs( const std::vector<EventLogObjectsType>& eventRecords) { @@ -492,7 +489,6 @@ class Subscription : public persistent_data::UserSubscription sendEvent(std::move(strMsg)); eventSeqNum++; } -#endif void filterAndSendReports(const std::string& reportId, const telemetry::TimestampReadings& var) @@ -682,11 +678,11 @@ class EventServiceManager updateNoOfSubscribersCount(); -#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES - - cacheRedfishLogFile(); + if constexpr (!BMCWEB_REDFISH_DBUS_LOG) + { + cacheRedfishLogFile(); + } -#endif // Update retry configuration. subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); } @@ -942,12 +938,13 @@ class EventServiceManager updateSubscriptionData(); } -#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES - if (redfishLogFilePosition != 0) + if constexpr (!BMCWEB_REDFISH_DBUS_LOG) { - cacheRedfishLogFile(); + if (redfishLogFilePosition != 0) + { + cacheRedfishLogFile(); + } } -#endif // Update retry configuration. subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); @@ -1097,8 +1094,6 @@ class EventServiceManager } } -#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES - void resetRedfishFilePosition() { // Control would be here when Redfish file is created. @@ -1336,7 +1331,6 @@ class EventServiceManager return 0; } -#endif static void getReadingsForReport(sdbusplus::message_t& msg) { if (msg.is_method_error()) |