commit b3028762bafd9e0ef4666c2fa423c3c582e07ce8
author Brandon Wyman <bjwyman@gmail.com> Mon Nov 09 17:05:36 2020 -0600
committer Brandon Wyman <bjwyman@gmail.com> Thu Mar 25 12:31:36 2021 -0500
tree 3ae72dc29e05f294da43f82fdb02cbb3172b8484
parent 510acaabb36ab8a2328e5185e022a7affcc0ddc4

psu-ng: Change main to call non-JSON PSUManager

Change the main function to create the PSU manager object using the
constructor that will pull configuration from D-Bus rather than from a
JSON configuration file.

Since the JSON configuration file parsing information is no longer
passed down to the constructor, remove the argument parsing and default
file handling code.

Update the README to remove the JSON configuration information, add the
D-Bus configuration information.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: I04f0d532f862bb4e8aa2e7a88dc06327c90d777d

phosphor-power-supply/main.cpp

diff --git a/phosphor-power-supply/main.cpp b/phosphor-power-supply/main.cpp
index 8960a53..c48c73a 100644
--- a/phosphor-power-supply/main.cpp
+++ b/phosphor-power-supply/main.cpp
@@ -24,7 +24,7 @@
 
 using namespace phosphor::power;
 
-int main(int argc, char* argv[])
+int main(void)
 {
     try
     {
@@ -32,34 +32,6 @@
 
         CLI::App app{"OpenBMC Power Supply Unit Monitor"};
 
-        std::string configfile;
-        app.add_option("-c,--config", configfile,
-                       "JSON configuration file path");
-
-        // Read the arguments.
-        CLI11_PARSE(app, argc, argv);
-        if (configfile.empty())
-        {
-            if (std::filesystem::exists(
-                    "/etc/phosphor-psu-monitor/psu_config.json"))
-            {
-                configfile = "/etc/phosphor-psu-monitor/psu_config.json";
-            }
-            else
-            {
-                configfile = "/usr/share/phosphor-psu-monitor/psu_config.json";
-            }
-        }
-
-        if (!std::filesystem::exists(configfile))
-        {
-            log<level::ERR>((std::string("Configuration file does not exist: "
-                                         "FILENAME=") +
-                             configfile)
-                                .c_str());
-            return -1;
-        }
-
         auto bus = sdbusplus::bus::new_default();
         auto event = sdeventplus::Event::get_default();
 
@@ -67,7 +39,7 @@
         // handle both sd_events (for the timers) and dbus signals.
         bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
 
-        manager::PSUManager manager(bus, event, configfile);
+        manager::PSUManager manager(bus, event);
 
         return manager.run();
     }