From fb987af0919320eff044953ac85868a5e507f26e Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Wed, 19 Feb 2025 14:31:06 -0600
Subject: [PATCH] refactor

---
 monitarr/monitarr/main.cpp | 93 +++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/monitarr/monitarr/main.cpp b/monitarr/monitarr/main.cpp
index 6bd01b6..4d8c865 100644
--- a/monitarr/monitarr/main.cpp
+++ b/monitarr/monitarr/main.cpp
@@ -30,85 +30,106 @@ struct monitarr_exception_handler final
     : public utils::error::i_exception_handler {
   void handle_debug(std::string_view function_name,
                     std::string_view msg) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->debug(utils::error::create_error_message(function_name, {msg}));
-    }
     spdlog::get("console")->debug(
         utils::error::create_error_message(function_name, {msg}));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->debug(utils::error::create_error_message(function_name, {msg}));
   }
 
   void handle_error(std::string_view function_name,
                     std::string_view msg) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->error(utils::error::create_error_message(function_name, {msg}));
-    }
     spdlog::get("console")->error(
         utils::error::create_error_message(function_name, {msg}));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->error(utils::error::create_error_message(function_name, {msg}));
   }
 
   void handle_exception(std::string_view function_name) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->error(utils::error::create_error_message(function_name,
-                                                     {
-                                                         "exception",
-                                                         "unknown exception",
-                                                     }));
-    }
     spdlog::get("console")->error(utils::error::create_error_message(
         function_name, {
                            "exception",
                            "unknown exception",
                        }));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->error(utils::error::create_error_message(function_name,
+                                                   {
+                                                       "exception",
+                                                       "unknown exception",
+                                                   }));
   }
 
   void handle_exception(std::string_view function_name,
                         const std::exception &ex) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->error(utils::error::create_error_message(
-          function_name, {
-                             "exception",
-                             (ex.what() == nullptr ? "unknown" : ex.what()),
-                         }));
-    }
     spdlog::get("console")->error(utils::error::create_error_message(
         function_name, {
                            "exception",
                            (ex.what() == nullptr ? "unknown" : ex.what()),
                        }));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->error(utils::error::create_error_message(
+        function_name, {
+                           "exception",
+                           (ex.what() == nullptr ? "unknown" : ex.what()),
+                       }));
   }
 
   void handle_info(std::string_view function_name,
                    std::string_view msg) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->info(utils::error::create_error_message(function_name, {msg}));
-    }
     spdlog::get("console")->info(
         utils::error::create_error_message(function_name, {msg}));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->info(utils::error::create_error_message(function_name, {msg}));
   }
 
   void handle_trace(std::string_view function_name,
                     std::string_view msg) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->trace(utils::error::create_error_message(function_name, {msg}));
-    }
     spdlog::get("console")->trace(
         utils::error::create_error_message(function_name, {msg}));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->trace(utils::error::create_error_message(function_name, {msg}));
   }
 
   void handle_warn(std::string_view function_name,
                    std::string_view msg) const override {
-    auto file = spdlog::get("file");
-    if (file) {
-      file->warn(utils::error::create_error_message(function_name, {msg}));
-    }
     spdlog::get("console")->warn(
         utils::error::create_error_message(function_name, {msg}));
+
+    auto file = spdlog::get("file");
+    if (not file) {
+      return;
+    }
+
+    file->warn(utils::error::create_error_message(function_name, {msg}));
   }
 };