Register match always
Currently the match is only registered if the probe
passes at least once. We're seeing some conflict on
start where the first probe might fail, causing the
match to go unregisterd. This fixes that.
Tested: Regression testing was performed
Change-Id: I3cb6ad8a9a085d249eda0998604f0c363aba29e9
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/include/EntityManager.hpp b/include/EntityManager.hpp
index 1b247d5..b9c1b47 100644
--- a/include/EntityManager.hpp
+++ b/include/EntityManager.hpp
@@ -24,6 +24,7 @@
#include <iostream>
#include <list>
#include <nlohmann/json.hpp>
+#include <sdbusplus/asio/object_server.hpp>
#include <string>
using DBusProbeObjectT = boost::container::flat_map<
@@ -39,13 +40,15 @@
PerformScan(nlohmann::json& systemConfiguration,
nlohmann::json& missingConfigurations,
std::list<nlohmann::json>& configurations,
- std::function<void(const DBusProbeObjectT&)>&& callback);
+ sdbusplus::asio::object_server& objServer,
+ std::function<void()>&& callback);
void run(void);
virtual ~PerformScan();
nlohmann::json& _systemConfiguration;
nlohmann::json& _missingConfigurations;
std::list<nlohmann::json> _configurations;
- std::function<void(const DBusProbeObjectT&)> _callback;
+ sdbusplus::asio::object_server& objServer;
+ std::function<void()> _callback;
bool _passed = false;
bool powerWasOn = isPowerOn();
DBusProbeObjectT dbusProbeObjects;
@@ -156,4 +159,4 @@
"REDFISH_MESSAGE_ID=%s", "OpenBMC.0.1.InventoryRemoved",
"REDFISH_MESSAGE_ARGS=%s,%s,%s", model.c_str(),
type.c_str(), sn.c_str(), NULL);
-}
\ No newline at end of file
+}