presence: Use new JsonConfig object
To simplify handling the loading of config files, use the updated
JsonConfig object that populates the available compatibility values used
when retrieving the JSON file and loading it. The given load function is
called if compatibility values are found upon being constructed or after
an interfacesAdded signal is received, which then it can call
`getConfFile` to find the JSON config file to be loaded.
Change-Id: I7698f0abf91dc6414386a42b710bcde9c3f47612
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/presence/json_parser.cpp b/presence/json_parser.cpp
index c4ff3b8..4c4a55c 100644
--- a/presence/json_parser.cpp
+++ b/presence/json_parser.cpp
@@ -50,9 +50,11 @@
JsonConfig::JsonConfig(sdbusplus::bus::bus& bus) : _bus(bus)
{}
-void JsonConfig::start(const std::string& confFile)
+void JsonConfig::start()
{
- process(phosphor::fan::JsonConfig::load(confFile));
+ using config = fan::JsonConfig;
+
+ process(config::load(config::getConfFile(_bus, confAppName, confFileName)));
for (auto& p : _policies)
{
diff --git a/presence/json_parser.hpp b/presence/json_parser.hpp
index 857a2f8..fc60229 100644
--- a/presence/json_parser.hpp
+++ b/presence/json_parser.hpp
@@ -78,10 +78,8 @@
* @brief Parses and populates the fan presence policies from
* the json file and then starts the actual presence
* detecting.
- *
- * @param[in] confFile - The conf file name to use
*/
- void start(const std::string& confFile);
+ void start();
private:
/* Fan presence policies */
diff --git a/presence/tach_detect.cpp b/presence/tach_detect.cpp
index 3527105..5c1fbc9 100644
--- a/presence/tach_detect.cpp
+++ b/presence/tach_detect.cpp
@@ -41,9 +41,7 @@
// jsonConfig will call config::start when
// the conf file is available.
phosphor::fan::JsonConfig jsonConfig{
- bus, presence::confAppName, presence::confFileName,
- std::bind(&presence::JsonConfig::start, &config,
- std::placeholders::_1)};
+ std::bind(&presence::JsonConfig::start, &config)};
stdplus::signal::block(SIGHUP);
sdeventplus::source::Signal signal(