Refactor PropertiesChanged handler setup
Most sensor daemons had pretty much the same duplicated open-coded
pattern for setting up PropertiesChanged signal matches; introduce a
helper function to reduce the duplication and make things more readable.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: I803a21eea2f6d7fc71b50d54bb8fd57a104f3349
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index a13b1c5..61a03fb 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -947,7 +947,6 @@
sdbusplus::asio::object_server objectServer(systemBus);
std::shared_ptr<ExitAirTempSensor> sensor =
nullptr; // wait until we find the config
- std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
io.post([&]() { createSensor(objectServer, sensor, systemBus); });
@@ -969,15 +968,8 @@
}
});
};
- for (const char* type : monitorIfaces)
- {
- auto match = std::make_unique<sdbusplus::bus::match_t>(
- static_cast<sdbusplus::bus_t&>(*systemBus),
- "type='signal',member='PropertiesChanged',path_namespace='" +
- std::string(inventoryPath) + "',arg0namespace='" + type + "'",
- eventHandler);
- matches.emplace_back(std::move(match));
- }
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches =
+ setupPropertiesChangedMatches(*systemBus, monitorIfaces, eventHandler);
setupManufacturingModeMatch(*systemBus);
io.run();