commit 9f616dd138373cff812a349e6b31da534d1d6bbb
author Ed Tanous <ed@tanous.net> Mon Sep 28 19:05:38 2020 -0700
committer Ed Tanous <ed@tanous.net> Tue Oct 06 15:49:12 2020 +0000
tree 68eefae71e2cfc1ec1a62d7da85c43b2648ab99f
parent c24e6b83cad7f5bbdc6077d1c57246c7fc4b08cb

Modernize event service manager and sse

Move static initialization of variables into the variables
themselves and use = default for the destructor.

Also, deleted constructors/destructors/move operators should be public,
not private.

Tested:
Code builds.  No substantial changes.

Signed-off-by: Ed Tanous <ed@tanous.net>
Change-Id: I156b6d7ce4c59d636bec6e722de981bbd0f727c3

redfish-core/include/event_service_manager.hpp

diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index ded8dbc..a6fe829 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -395,8 +395,7 @@
         sseConn = std::make_shared<crow::ServerSentEvents>(adaptor);
     }
 
-    ~Subscription()
-    {}
+    ~Subscription() = default;
 
     void sendEvent(const std::string& msg)
     {
@@ -600,28 +599,27 @@
     uint32_t retryAttempts;
     uint32_t retryTimeoutInterval;
 
-    EventServiceManager(const EventServiceManager&) = delete;
-    EventServiceManager& operator=(const EventServiceManager&) = delete;
-    EventServiceManager(EventServiceManager&&) = delete;
-    EventServiceManager& operator=(EventServiceManager&&) = delete;
-
-    EventServiceManager() :
-        noOfEventLogSubscribers(0), noOfMetricReportSubscribers(0), eventId(1)
+    EventServiceManager()
     {
         // Load config from persist store.
         initConfig();
     }
 
     std::string lastEventTStr;
-    size_t noOfEventLogSubscribers;
-    size_t noOfMetricReportSubscribers;
+    size_t noOfEventLogSubscribers{0};
+    size_t noOfMetricReportSubscribers{0};
     std::shared_ptr<sdbusplus::bus::match::match> matchTelemetryMonitor;
     boost::container::flat_map<std::string, std::shared_ptr<Subscription>>
         subscriptionsMap;
 
-    uint64_t eventId;
+    uint64_t eventId{1};
 
   public:
+    EventServiceManager(const EventServiceManager&) = delete;
+    EventServiceManager& operator=(const EventServiceManager&) = delete;
+    EventServiceManager(EventServiceManager&&) = delete;
+    EventServiceManager& operator=(EventServiceManager&&) = delete;
+
     static EventServiceManager& getInstance()
     {
         static EventServiceManager handler;

redfish-core/include/server_sent_events.hpp

diff --git a/redfish-core/include/server_sent_events.hpp b/redfish-core/include/server_sent_events.hpp
index 9689001..ee4ad4d 100644
--- a/redfish-core/include/server_sent_events.hpp
+++ b/redfish-core/include/server_sent_events.hpp
@@ -267,8 +267,7 @@
         startSSE();
     }
 
-    ~ServerSentEvents()
-    {}
+    ~ServerSentEvents() = default;
 
     void sendData(const uint64_t& id, const std::string& data)
     {