commit f6d7f6151a0cce8d731842cc030c9077e359c3f3
author Matthew Barth <msbarth@us.ibm.com> Tue Dec 10 15:22:54 2019 -0600
committer Matthew Barth <msbarth@us.ibm.com> Thu Jan 09 11:16:12 2020 -0600
tree e3e1ca53b32c2e38a95b4f2b1357d02e0c574050
parent 3a429d91c39f468d25ade427b30f818edcc723d5

presence: Split config filename from path

Change-Id: I295807c724ce849c43376998330ddd1eaa939fe5
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

presence/json_config.cpp

diff --git a/presence/json_config.cpp b/presence/json_config.cpp
index 6dc06c2..59d452a 100644
--- a/presence/json_config.cpp
+++ b/presence/json_config.cpp
@@ -36,8 +36,6 @@
 namespace fs = std::filesystem;
 using namespace phosphor::logging;
 
-constexpr auto jsonFileAlt = "/etc/phosphor-fan-presence/presence/config.json";
-
 policies JsonConfig::_policies;
 const std::map<std::string, methodHandler> JsonConfig::_methods =
 {
@@ -50,8 +48,8 @@
     {"fallback", rpolicy::getFallback}
 };
 
-JsonConfig::JsonConfig(const std::string& jsonFile) :
-    _defaultFile(fs::path(jsonFile))
+JsonConfig::JsonConfig(const std::string& jsonConfigPath) :
+    _defaultFile(fs::path(fs::path{jsonConfigPath} / jsonFileName))
 {
     if (!_defaultFile.empty())
     {
@@ -92,7 +90,7 @@
 
 void JsonConfig::load()
 {
-    fs::path confFile{jsonFileAlt};
+    fs::path confFile{fs::path{jsonOverridePath} / jsonFileName};
     if (!fs::exists(confFile))
     {
         confFile = _defaultFile;

presence/json_config.hpp

diff --git a/presence/json_config.hpp b/presence/json_config.hpp
index a369bd5..206b290 100644
--- a/presence/json_config.hpp
+++ b/presence/json_config.hpp
@@ -21,6 +21,10 @@
 
 namespace fs = std::filesystem;
 using json = nlohmann::json;
+
+constexpr auto jsonFileName = "config.json";
+constexpr auto jsonOverridePath = "/etc/phosphor-fan-presence/presence";
+
 using policies = std::vector<std::unique_ptr<RedundancyPolicy>>;
 
 constexpr auto fanPolicyFanPos = 0;
@@ -49,9 +53,9 @@
          * Constructor
          * Parses and populates the fan presence policies from a json file
          *
-         * @param[in] jsonFile - json configuration file
+         * @param[in] jsonConfigPath - json configuration path
          */
-        explicit JsonConfig(const std::string& jsonFile);
+        explicit JsonConfig(const std::string& jsonConfigPath);
 
         /**
          * @brief Get the json config based fan presence policies