Public/monitarr
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix log location

Browse Source
This commit is contained in:
Scott E. Graves 2025-02-20 18:10:13 -06:00
parent 797036612a
commit ba54e4d02e
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitarr/libmonitarr/include/data_db.hpp
View File

@ -61,7 +61,7 @@ public:
[[nodiscard]] auto get(std::string_view download_id) const [[nodiscard]] auto get(std::string_view download_id) const
-> std::optional<data_entry>; -> std::optional<data_entry>;
void open(std::string_view data_dir); void open(std::string_view data_dir, std::string_view log_dir);
void remove(std::string_view download_id); void remove(std::string_view download_id);

4
monitarr/libmonitarr/src/data_db.cpp
View File

@ -57,7 +57,7 @@ auto data_db::get(std::string_view download_id) const
return ret; return ret;
} }
void data_db::open(std::string_view data_dir) { void data_db::open(std::string_view data_dir, std::string_view log_dir) {
MONITARR_USES_FUNCTION_NAME(); MONITARR_USES_FUNCTION_NAME();
auto db_path = utils::path::combine(data_dir, {"state_db"}); auto db_path = utils::path::combine(data_dir, {"state_db"});
@ -67,7 +67,7 @@ void data_db::open(std::string_view data_dir) {
rocksdb::Options options{}; rocksdb::Options options{};
options.create_if_missing = true; options.create_if_missing = true;
options.create_missing_column_families = true; options.create_missing_column_families = true;
options.db_log_dir = data_dir; options.db_log_dir = utils::path::combine(log_dir, {"state_db"});
options.keep_log_file_num = 10; options.keep_log_file_num = 10;
rocksdb::TransactionDB *ptr{}; rocksdb::TransactionDB *ptr{};

3
monitarr/monitarr/include/run_cmd.hpp
View File

@ -27,7 +27,8 @@
namespace monitarr { namespace monitarr {
struct app_config; struct app_config;
[[nodiscard]] auto run_cmd(const app_config &cfg) -> int; [[nodiscard]] auto run_cmd(const app_config &cfg, std::string_view log_dir)
-> int;
} // namespace monitarr } // namespace monitarr
#endif // LIBMONITARR_INCLUDE_RUN_CMD_HPP_ #endif // LIBMONITARR_INCLUDE_RUN_CMD_HPP_

2
monitarr/monitarr/main.cpp
View File

@ -98,7 +98,7 @@ auto main(int argc, char **argv) -> int {
spdlog::create_async<spdlog::sinks::rotating_file_sink_mt>( spdlog::create_async<spdlog::sinks::rotating_file_sink_mt>(
"file", utils::path::combine(log_dir, {"monitarr.log"}), "file", utils::path::combine(log_dir, {"monitarr.log"}),
MAX_LOG_FILE_SIZE, MAX_LOG_FILES); MAX_LOG_FILE_SIZE, MAX_LOG_FILES);
ret = run_cmd(cfg); ret = run_cmd(cfg, log_dir);
} else if (has_arg("-s", argc, argv)) { } else if (has_arg("-s", argc, argv)) {
ret = show_cmd(argc, argv, cfg); ret = show_cmd(argc, argv, cfg);
} else { } else {

8
monitarr/monitarr/src/run_cmd.cpp
View File

@ -129,7 +129,7 @@ static void check_server(const server_cfg &server, data_db &state_db) {
} }
} }
[[nodiscard]] static auto load_db() -> data_db { [[nodiscard]] static auto load_db(std::string_view log_dir) -> data_db {
MONITARR_USES_FUNCTION_NAME(); MONITARR_USES_FUNCTION_NAME();
auto data_dir = utils::get_environment_variable("MONITARR_DATA_DIR"); auto data_dir = utils::get_environment_variable("MONITARR_DATA_DIR");
@ -147,11 +147,11 @@ static void check_server(const server_cfg &server, data_db &state_db) {
} }
data_db state_db{}; data_db state_db{};
state_db.open(data_dir); state_db.open(data_dir, log_dir);
return state_db; return state_db;
} }
auto run_cmd(const app_config &cfg) -> int { auto run_cmd(const app_config &cfg, std::string_view log_dir) -> int {
MONITARR_USES_FUNCTION_NAME(); MONITARR_USES_FUNCTION_NAME();
auto ret{0}; auto ret{0};
@ -167,7 +167,7 @@ auto run_cmd(const app_config &cfg) -> int {
"no servers have been configured"); "no servers have been configured");
ret = 3; ret = 3;
} else { } else {
auto state_db{load_db()}; auto state_db{load_db(log_dir)};
while (not stop_requested) { while (not stop_requested) {
std::for_each(std::execution::par, cfg.server_list.begin(), std::for_each(std::execution::par, cfg.server_list.begin(),