From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 1 Aug 2023 15:50:57 +0000 (+0200)
Subject: ixfrdist: Delint ixfrdist.cc a bit more
X-Git-Tag: rec-5.0.0-alpha1~62^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a03ef0a5e85d6f8a273732e1e38c6716a9dcee39;p=thirdparty%2Fpdns.git

ixfrdist: Delint ixfrdist.cc a bit more
---

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index 08528e5082..bab9120539 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -1369,7 +1369,7 @@ static std::optional<IXFRDistConfiguration> parseConfiguration(int argc, char**
     }
 
     if (config["uid"].IsDefined()) {
-      string uid = config["uid"].as<string>();
+      auto uid = config["uid"].as<string>();
       try {
         configuration.uid = pdns::checked_stoi<uid_t>(uid);
       }
@@ -1409,30 +1409,38 @@ static std::optional<IXFRDistConfiguration> parseConfiguration(int argc, char**
 }
 
 int main(int argc, char** argv) {
-  g_log.setLoglevel(Logger::Notice);
-  g_log.toConsole(Logger::Notice);
-  g_log.setPrefixed(true);
-  g_log.disableSyslog(true);
-  g_log.setTimestamps(false);
+  bool had_error = false;
+  std::optional<IXFRDistConfiguration> configuration{std::nullopt};
+  std::unique_ptr<FDMultiplexer> fdm{nullptr};
 
-  auto fdm = std::unique_ptr<FDMultiplexer>(FDMultiplexer::getMultiplexerSilent());
-  if (!fdm) {
-    g_log<<Logger::Error<<"Could not enable a multiplexer for the listen sockets!"<<endl;
-    return EXIT_FAILURE;
-  }
+  try {
+    g_log.setLoglevel(Logger::Notice);
+    g_log.toConsole(Logger::Notice);
+    g_log.setPrefixed(true);
+    g_log.disableSyslog(true);
+    g_log.setTimestamps(false);
+
+    fdm = std::unique_ptr<FDMultiplexer>(FDMultiplexer::getMultiplexerSilent());
+    if (!fdm) {
+      g_log<<Logger::Error<<"Could not enable a multiplexer for the listen sockets!"<<endl;
+      return EXIT_FAILURE;
+    }
 
-  auto configuration = parseConfiguration(argc, argv, *fdm);
+    configuration = parseConfiguration(argc, argv, *fdm);
+    if (!configuration) {
+      // We have already sent the errors to stderr, just die
+      return EXIT_FAILURE;
+    }
 
-  if (!configuration) {
-    // We have already sent the errors to stderr, just die
-    return EXIT_FAILURE;
+    if (configuration->done) {
+      return EXIT_SUCCESS;
+    }
   }
-
-  if (configuration->done) {
-    return EXIT_SUCCESS;
+  catch (const YAML::Exception& exp) {
+    had_error = true;
+    g_log<<Logger::Error<<"Got an exception while processing our configuration: "<<exp.msg<<endl;
   }
 
-  bool had_error = false;
   try {
     if (configuration->gid != 0) {
       g_log<<Logger::Notice<<"Dropping effective group-id to "<<configuration->gid<<endl;
@@ -1445,6 +1453,7 @@ int main(int argc, char** argv) {
     // It all starts here
     signal(SIGTERM, handleSignal);
     signal(SIGINT, handleSignal);
+    //NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
     signal(SIGPIPE, SIG_IGN);
 
     // Launch the webserver!
@@ -1483,7 +1492,13 @@ int main(int argc, char** argv) {
     if (had_error) {
       return EXIT_FAILURE;
     }
+  }
+  catch (const YAML::Exception& exp) {
+    had_error = true;
+    g_log<<Logger::Error<<"Got an exception while applying our configuration: "<<exp.msg<<endl;
+  }
 
+  try {
     // Init the things we need
     reportAllTypes();
 
@@ -1527,7 +1542,7 @@ int main(int argc, char** argv) {
   }
   catch (const YAML::Exception& exp) {
     had_error = true;
-    g_log<<Logger::Error<<"Got an exception while applying our configuration: "<<exp.msg<<endl;
+    g_log<<Logger::Error<<"Got an exception: "<<exp.msg<<endl;
   }
 
   return had_error ? EXIT_FAILURE : EXIT_SUCCESS;