From e21fbe84baf9d24cc2feba3b8ecc630cedc1ee77 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 25 Jul 2024 19:02:34 -0500
Subject: [PATCH] fix

---
 .../include/events/consumers/console_consumer.hpp    |  7 -------
 .../include/events/consumers/logging_consumer.hpp    |  7 -------
 .../src/events/consumers/console_consumer.cpp        | 10 ++++++----
 .../src/events/consumers/logging_consumer.cpp        | 12 +++++++-----
 scripts/options.sh                                   |  3 +++
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/repertory/librepertory/include/events/consumers/console_consumer.hpp b/repertory/librepertory/include/events/consumers/console_consumer.hpp
index 9df02f3b..1dd845ae 100644
--- a/repertory/librepertory/include/events/consumers/console_consumer.hpp
+++ b/repertory/librepertory/include/events/consumers/console_consumer.hpp
@@ -24,10 +24,6 @@
 
 #include "events/event_system.hpp"
 
-namespace spdlog {
-class logger;
-}
-
 namespace repertory {
 class console_consumer final {
   E_CONSUMER();
@@ -39,9 +35,6 @@ public:
 
   ~console_consumer();
 
-private:
-  std::shared_ptr<spdlog::logger> logger_;
-
 private:
   void process_event(const event &e) const;
 };
diff --git a/repertory/librepertory/include/events/consumers/logging_consumer.hpp b/repertory/librepertory/include/events/consumers/logging_consumer.hpp
index 8595e49f..bd90fea3 100644
--- a/repertory/librepertory/include/events/consumers/logging_consumer.hpp
+++ b/repertory/librepertory/include/events/consumers/logging_consumer.hpp
@@ -24,10 +24,6 @@
 
 #include "events/event_system.hpp"
 
-namespace spdlog {
-class logger;
-}
-
 namespace repertory {
 class logging_consumer {
   E_CONSUMER();
@@ -42,9 +38,6 @@ private:
   static constexpr const std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL *
                                                          5ULL};
 
-private:
-  std::shared_ptr<spdlog::logger> logger_;
-
 private:
   void process_event(const event &event) const;
 };
diff --git a/repertory/librepertory/src/events/consumers/console_consumer.cpp b/repertory/librepertory/src/events/consumers/console_consumer.cpp
index db890c59..164228e9 100644
--- a/repertory/librepertory/src/events/consumers/console_consumer.cpp
+++ b/repertory/librepertory/src/events/consumers/console_consumer.cpp
@@ -56,11 +56,13 @@ console_consumer::console_consumer(event_level level) {
     }
   };
 
-  spdlog::drop("console");
-  logger_ =
-      spdlog::create_async<spdlog::sinks::stdout_color_sink_mt>("console");
+  try {
+    spdlog::register_logger(
+        spdlog::create_async<spdlog::sinks::stdout_color_sink_mt>("console"));
+  } catch (...) {
+  }
+
   set_level(level);
-  spdlog::register_logger(logger_);
 
   E_SUBSCRIBE_ALL(process_event);
   E_SUBSCRIBE_EXACT(event_level_changed,
diff --git a/repertory/librepertory/src/events/consumers/logging_consumer.cpp b/repertory/librepertory/src/events/consumers/logging_consumer.cpp
index 24ff69dd..f86f7dc2 100644
--- a/repertory/librepertory/src/events/consumers/logging_consumer.cpp
+++ b/repertory/librepertory/src/events/consumers/logging_consumer.cpp
@@ -58,12 +58,14 @@ logging_consumer::logging_consumer(event_level level,
     }
   };
 
-  spdlog::drop("file");
-  logger_ = spdlog::create_async<spdlog::sinks::rotating_file_sink_mt>(
-      "file", utils::path::combine(log_directory, {"repertory.log"}),
-      MAX_LOG_FILE_SIZE, MAX_LOG_FILES);
+  try {
+    spdlog::register_logger(
+        spdlog::create_async<spdlog::sinks::rotating_file_sink_mt>(
+            "file", utils::path::combine(log_directory, {"repertory.log"}),
+            MAX_LOG_FILE_SIZE, MAX_LOG_FILES));
+  } catch (...) {
+  }
   set_level(level);
-  spdlog::register_logger(logger_);
 
   E_SUBSCRIBE_ALL(process_event);
   E_SUBSCRIBE_EXACT(event_level_changed,
diff --git a/scripts/options.sh b/scripts/options.sh
index 9e70d8ad..7cc72f36 100755
--- a/scripts/options.sh
+++ b/scripts/options.sh
@@ -2,6 +2,7 @@
 
 PROJECT_LIBRARIES=(
   BOOST
+  CPP_HTTPLIB
   CURL
   FUSE
   JSON
@@ -17,8 +18,10 @@ PROJECT_LIBRARIES=(
 
 declare -A PROJECT_CLEANUP
 PROJECT_CLEANUP[BOOST]="boost_*"
+PROJECT_CLEANUP[CPP_HTTPLIB]="cpp-httplib-*"
 PROJECT_CLEANUP[CURL]="curl-*"
 PROJECT_CLEANUP[JSON]="json-*"
+PROJECT_CLEANUP[LIBBITCOIN_SYSTEM_ON]="boost_1_85_*"
 PROJECT_CLEANUP[LIBSODIUM]="libsodium*"
 PROJECT_CLEANUP[OPENSSL]="openssl-*"
 PROJECT_CLEANUP[PUGIXML]="pugixml-*"