BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

fix
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves 2024-07-25 19:02:34 -05:00
parent 1e4d675f76
commit e21fbe84ba
5 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
repertory/librepertory/include/events/consumers/console_consumer.hpp
View File

@ -24,10 +24,6 @@
#include "events/event_system.hpp" #include "events/event_system.hpp"
namespace spdlog {
class logger;
}
namespace repertory { namespace repertory {
class console_consumer final { class console_consumer final {
E_CONSUMER(); E_CONSUMER();
@ -39,9 +35,6 @@ public:
~console_consumer(); ~console_consumer();
private:
std::shared_ptr<spdlog::logger> logger_;
private: private:
void process_event(const event &e) const; void process_event(const event &e) const;
}; };

7
repertory/librepertory/include/events/consumers/logging_consumer.hpp
View File

@ -24,10 +24,6 @@
#include "events/event_system.hpp" #include "events/event_system.hpp"
namespace spdlog {
class logger;
}
namespace repertory { namespace repertory {
class logging_consumer { class logging_consumer {
E_CONSUMER(); E_CONSUMER();
@ -42,9 +38,6 @@ private:
static constexpr const std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL * static constexpr const std::uint64_t MAX_LOG_FILE_SIZE{1024ULL * 1024ULL *
5ULL}; 5ULL};
private:
std::shared_ptr<spdlog::logger> logger_;
private: private:
void process_event(const event &event) const; void process_event(const event &event) const;
}; };

10
repertory/librepertory/src/events/consumers/console_consumer.cpp
View File

@ -56,11 +56,13 @@ console_consumer::console_consumer(event_level level) {
} }
}; };
spdlog::drop("console"); try {
logger_ = spdlog::register_logger(
spdlog::create_async<spdlog::sinks::stdout_color_sink_mt>("console"); spdlog::create_async<spdlog::sinks::stdout_color_sink_mt>("console"));
} catch (...) {
}
set_level(level); set_level(level);
spdlog::register_logger(logger_);
E_SUBSCRIBE_ALL(process_event); E_SUBSCRIBE_ALL(process_event);
E_SUBSCRIBE_EXACT(event_level_changed, E_SUBSCRIBE_EXACT(event_level_changed,

12
repertory/librepertory/src/events/consumers/logging_consumer.cpp
View File

@ -58,12 +58,14 @@ logging_consumer::logging_consumer(event_level level,
} }
}; };
spdlog::drop("file"); try {
logger_ = spdlog::create_async<spdlog::sinks::rotating_file_sink_mt>( spdlog::register_logger(
"file", utils::path::combine(log_directory, {"repertory.log"}), spdlog::create_async<spdlog::sinks::rotating_file_sink_mt>(
MAX_LOG_FILE_SIZE, MAX_LOG_FILES); "file", utils::path::combine(log_directory, {"repertory.log"}),
MAX_LOG_FILE_SIZE, MAX_LOG_FILES));
} catch (...) {
}
set_level(level); set_level(level);
spdlog::register_logger(logger_);
E_SUBSCRIBE_ALL(process_event); E_SUBSCRIBE_ALL(process_event);
E_SUBSCRIBE_EXACT(event_level_changed, E_SUBSCRIBE_EXACT(event_level_changed,

3
scripts/options.sh
View File

@ -2,6 +2,7 @@
PROJECT_LIBRARIES=( PROJECT_LIBRARIES=(
BOOST BOOST
CPP_HTTPLIB
CURL CURL
FUSE FUSE
JSON JSON
@ -17,8 +18,10 @@ PROJECT_LIBRARIES=(
declare -A PROJECT_CLEANUP declare -A PROJECT_CLEANUP
PROJECT_CLEANUP[BOOST]="boost_*" PROJECT_CLEANUP[BOOST]="boost_*"
PROJECT_CLEANUP[CPP_HTTPLIB]="cpp-httplib-*"
PROJECT_CLEANUP[CURL]="curl-*" PROJECT_CLEANUP[CURL]="curl-*"
PROJECT_CLEANUP[JSON]="json-*" PROJECT_CLEANUP[JSON]="json-*"
PROJECT_CLEANUP[LIBBITCOIN_SYSTEM_ON]="boost_1_85_*"
PROJECT_CLEANUP[LIBSODIUM]="libsodium*" PROJECT_CLEANUP[LIBSODIUM]="libsodium*"
PROJECT_CLEANUP[OPENSSL]="openssl-*" PROJECT_CLEANUP[OPENSSL]="openssl-*"
PROJECT_CLEANUP[PUGIXML]="pugixml-*" PROJECT_CLEANUP[PUGIXML]="pugixml-*"