commit 4fd52ae4ea33b05d52445d7ebfd0a610c47f7e08
author William A. Kennington III <wak@google.com> Fri Sep 30 13:49:39 2022 -0700
committer William A. Kennington III <wak@google.com> Mon Oct 03 13:54:57 2022 -0700
tree fe1ad66f335fb36c34a8a7dd6fbfa59d4fa208dd
parent 95530ec9fbfd478f85b1452571b9df21c76ec242

main: Catch and handle all exceptions

Change-Id: I75a04860fe0647ca655fcbc9c9bd674199ba13e5
Signed-off-by: William A. Kennington III <wak@google.com>

src/network_manager_main.cpp

diff --git a/src/network_manager_main.cpp b/src/network_manager_main.cpp
index 6a9c740..73df65d 100644
--- a/src/network_manager_main.cpp
+++ b/src/network_manager_main.cpp
@@ -7,6 +7,7 @@
 #include "util.hpp"
 #endif
 
+#include <fmt/format.h>
 #include <linux/netlink.h>
 
 #include <filesystem>
@@ -48,7 +49,7 @@
 namespace network
 {
 
-std::unique_ptr<phosphor::network::Manager> manager = nullptr;
+std::unique_ptr<Manager> manager = nullptr;
 std::unique_ptr<Timer> refreshObjectTimer = nullptr;
 std::unique_ptr<Timer> reloadTimer = nullptr;
 
@@ -87,7 +88,7 @@
             if (status)
             {
                 log<level::INFO>("Removing the match for ethernet interfaces");
-                phosphor::network::EthInterfaceMatch = nullptr;
+                EthInterfaceMatch = nullptr;
             }
         }
         else
@@ -194,12 +195,11 @@
                         }
                         else
                         {
-                            if (!phosphor::network::setInventoryMACOnSystem(
-                                    bus, configJson, infname))
+                            if (!setInventoryMACOnSystem(bus, configJson,
+                                                         infname))
                             {
-                                phosphor::network::registerSignals(bus,
-                                                                   configJson);
-                                phosphor::network::EthInterfaceMatch = nullptr;
+                                registerSignals(bus, configJson);
+                                EthInterfaceMatch = nullptr;
                             }
                         }
                         break;
@@ -222,8 +222,7 @@
 
             log<level::INFO>(
                 "First boot file is not present, check VPD for MAC");
-            phosphor::network::EthInterfaceMatch = std::make_unique<
-                sdbusplus::bus::match_t>(
+            EthInterfaceMatch = std::make_unique<sdbusplus::bus::match_t>(
                 bus,
                 "interface='org.freedesktop.DBus.ObjectManager',type='signal',"
                 "member='InterfacesAdded',path='/xyz/openbmc_project/network'",
@@ -264,12 +263,9 @@
     reloadTimer = std::make_unique<Timer>(event, std::bind(reloadNetworkd));
 }
 
-} // namespace network
-} // namespace phosphor
-
-int main(int /*argc*/, char** /*argv*/)
+int main()
 {
-    phosphor::network::initializeTimers();
+    initializeTimers();
 
     auto bus = sdbusplus::bus::new_default();
 
@@ -282,7 +278,7 @@
         return r;
     }
 
-    phosphor::network::EventPtr eventPtr{event};
+    EventPtr eventPtr{event};
     event = nullptr;
 
     // Attach the bus to sd_event to service user requests
@@ -292,31 +288,46 @@
     sdbusplus::server::manager_t objManager(bus, DEFAULT_OBJPATH);
     bus.request_name(DEFAULT_BUSNAME);
 
-    phosphor::network::manager = std::make_unique<phosphor::network::Manager>(
-        bus, DEFAULT_OBJPATH, NETWORK_CONF_DIR);
+    manager = std::make_unique<Manager>(bus, DEFAULT_OBJPATH, NETWORK_CONF_DIR);
 
     // create the default network files if the network file
     // is not there for any interface.
-    if (phosphor::network::manager->createDefaultNetworkFiles())
+    if (manager->createDefaultNetworkFiles())
     {
-        phosphor::network::manager->reloadConfigs();
+        manager->reloadConfigs();
     }
 
     // RTNETLINK event handler
-    phosphor::network::rtnetlink::Server svr(eventPtr);
+    rtnetlink::Server svr(eventPtr);
 
 #ifdef SYNC_MAC_FROM_INVENTORY
     std::ifstream in(configFile);
     nlohmann::json configJson;
     in >> configJson;
-    phosphor::network::watchEthernetInterface(bus, configJson);
+    watchEthernetInterface(bus, configJson);
 #endif
 
     // Trigger the initial object scan
     // This is intentionally deferred, to ensure that systemd-networkd is
     // fully configured.
-    phosphor::network::refreshObjectTimer->restartOnce(
-        phosphor::network::refreshTimeout);
+    refreshObjectTimer->restartOnce(refreshTimeout);
 
-    sd_event_loop(eventPtr.get());
+    return sd_event_loop(eventPtr.get());
+}
+
+} // namespace network
+} // namespace phosphor
+
+int main(int /*argc*/, char** /*argv*/)
+{
+    try
+    {
+        return phosphor::network::main();
+    }
+    catch (const std::exception& e)
+    {
+        auto msg = fmt::format("FAILED: {}", e.what());
+        log<level::ERR>(msg.c_str(), entry("ERROR", e.what()));
+        return 1;
+    }
 }