rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-12-23 13:47:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2456

Browse source 
91def9a5 daemon, wallet: add --max-log-file-size option (selsta)
This commit is contained in:
Riccardo Spagni 2017-09-25 16:54:08 +02:00
commit 32bbe62120
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/epee/include/misc_log_ex.h
View file

@ -52,6 +52,7 @@
#include "easylogging++.h" #include "easylogging++.h"
#define MONERO_DEFAULT_LOG_CATEGORY "default" #define MONERO_DEFAULT_LOG_CATEGORY "default"
#define MAX_LOG_FILE_SIZE 104850000 // 100 MB - 7600 bytes
#define MCFATAL(cat,x) CLOG(FATAL,cat) << x #define MCFATAL(cat,x) CLOG(FATAL,cat) << x
#define MCERROR(cat,x) CLOG(ERROR,cat) << x #define MCERROR(cat,x) CLOG(ERROR,cat) << x
@ -123,7 +124,7 @@
#endif #endif
std::string mlog_get_default_log_path(const char *default_filename); std::string mlog_get_default_log_path(const char *default_filename);
void mlog_configure(const std::string &filename_base, bool console); void mlog_configure(const std::string &filename_base, bool console, const std::size_t max_log_file_size = MAX_LOG_FILE_SIZE);
void mlog_set_categories(const char *categories); void mlog_set_categories(const char *categories);
void mlog_set_log_level(int level); void mlog_set_log_level(int level);
void mlog_set_log(const char *log); void mlog_set_log(const char *log);

4
contrib/epee/src/mlog.cpp
View file

@ -111,7 +111,7 @@ static const char *get_default_categories(int level)
return categories; return categories;
} }
void mlog_configure(const std::string &filename_base, bool console) void mlog_configure(const std::string &filename_base, bool console, const std::size_t max_log_file_size)
{ {
el::Configurations c; el::Configurations c;
c.setGlobally(el::ConfigurationType::Filename, filename_base); c.setGlobally(el::ConfigurationType::Filename, filename_base);
@ -121,7 +121,7 @@ void mlog_configure(const std::string &filename_base, bool console)
log_format = MLOG_BASE_FORMAT; log_format = MLOG_BASE_FORMAT;
c.setGlobally(el::ConfigurationType::Format, log_format); c.setGlobally(el::ConfigurationType::Format, log_format);
c.setGlobally(el::ConfigurationType::ToStandardOutput, console ? "true" : "false"); c.setGlobally(el::ConfigurationType::ToStandardOutput, console ? "true" : "false");
c.setGlobally(el::ConfigurationType::MaxLogFileSize, "104850000"); // 100 MB - 7600 bytes c.setGlobally(el::ConfigurationType::MaxLogFileSize, std::to_string(max_log_file_size));
el::Loggers::setDefaultConfigurations(c, true); el::Loggers::setDefaultConfigurations(c, true);
el::Loggers::addFlag(el::LoggingFlag::HierarchicalLogging); el::Loggers::addFlag(el::LoggingFlag::HierarchicalLogging);

5
src/daemon/command_line_args.h
View file

@ -46,6 +46,11 @@ namespace daemon_args
, "Specify log file" , "Specify log file"
, "" , ""
}; };
const command_line::arg_descriptor<std::size_t> arg_max_log_file_size = {
"max-log-file-size"
, "Specify maximum log file size [B]"
, MAX_LOG_FILE_SIZE
};
const command_line::arg_descriptor<std::string> arg_log_level = { const command_line::arg_descriptor<std::string> arg_log_level = {
"log-level" "log-level"
, "" , ""

3
src/daemon/main.cpp
View file

@ -88,6 +88,7 @@ int main(int argc, char const * argv[])
bf::path default_log = default_data_dir / std::string(CRYPTONOTE_NAME ".log"); bf::path default_log = default_data_dir / std::string(CRYPTONOTE_NAME ".log");
command_line::add_arg(core_settings, daemon_args::arg_log_file, default_log.string()); command_line::add_arg(core_settings, daemon_args::arg_log_file, default_log.string());
command_line::add_arg(core_settings, daemon_args::arg_log_level); command_line::add_arg(core_settings, daemon_args::arg_log_level);
command_line::add_arg(core_settings, daemon_args::arg_max_log_file_size);
command_line::add_arg(core_settings, daemon_args::arg_max_concurrency); command_line::add_arg(core_settings, daemon_args::arg_max_concurrency);
command_line::add_arg(core_settings, daemon_args::arg_zmq_rpc_bind_ip); command_line::add_arg(core_settings, daemon_args::arg_zmq_rpc_bind_ip);
command_line::add_arg(core_settings, daemon_args::arg_zmq_rpc_bind_port); command_line::add_arg(core_settings, daemon_args::arg_zmq_rpc_bind_port);
@ -207,7 +208,7 @@ int main(int argc, char const * argv[])
if (! vm["log-file"].defaulted()) if (! vm["log-file"].defaulted())
log_file_path = command_line::get_arg(vm, daemon_args::arg_log_file); log_file_path = command_line::get_arg(vm, daemon_args::arg_log_file);
log_file_path = bf::absolute(log_file_path, relative_path_base); log_file_path = bf::absolute(log_file_path, relative_path_base);
mlog_configure(log_file_path.string(), true); mlog_configure(log_file_path.string(), true, command_line::get_arg(vm, daemon_args::arg_max_log_file_size));
// Set log level // Set log level
if (!vm["log-level"].defaulted()) if (!vm["log-level"].defaulted())

4
src/wallet/wallet_args.cpp
View file

@ -84,6 +84,7 @@ namespace wallet_args
#endif #endif
const command_line::arg_descriptor<std::string> arg_log_level = {"log-level", "0-4 or categories", ""}; const command_line::arg_descriptor<std::string> arg_log_level = {"log-level", "0-4 or categories", ""};
const command_line::arg_descriptor<std::size_t> arg_max_log_file_size = {"max-log-file-size", "Specify maximum log file size [B]", MAX_LOG_FILE_SIZE};
const command_line::arg_descriptor<uint32_t> arg_max_concurrency = {"max-concurrency", wallet_args::tr("Max number of threads to use for a parallel job"), DEFAULT_MAX_CONCURRENCY}; const command_line::arg_descriptor<uint32_t> arg_max_concurrency = {"max-concurrency", wallet_args::tr("Max number of threads to use for a parallel job"), DEFAULT_MAX_CONCURRENCY};
const command_line::arg_descriptor<std::string> arg_log_file = {"log-file", wallet_args::tr("Specify log file"), ""}; const command_line::arg_descriptor<std::string> arg_log_file = {"log-file", wallet_args::tr("Specify log file"), ""};
const command_line::arg_descriptor<std::string> arg_config_file = {"config-file", wallet_args::tr("Config file"), "", true}; const command_line::arg_descriptor<std::string> arg_config_file = {"config-file", wallet_args::tr("Config file"), "", true};
@ -101,6 +102,7 @@ namespace wallet_args
command_line::add_arg(desc_params, arg_log_file); command_line::add_arg(desc_params, arg_log_file);
command_line::add_arg(desc_params, arg_log_level); command_line::add_arg(desc_params, arg_log_level);
command_line::add_arg(desc_params, arg_max_log_file_size);
command_line::add_arg(desc_params, arg_max_concurrency); command_line::add_arg(desc_params, arg_max_concurrency);
command_line::add_arg(desc_params, arg_config_file); command_line::add_arg(desc_params, arg_config_file);
@ -156,7 +158,7 @@ namespace wallet_args
log_path = command_line::get_arg(vm, arg_log_file); log_path = command_line::get_arg(vm, arg_log_file);
else else
log_path = mlog_get_default_log_path(default_log_name); log_path = mlog_get_default_log_path(default_log_name);
mlog_configure(log_path, log_to_console); mlog_configure(log_path, log_to_console, command_line::get_arg(vm, arg_max_log_file_size));
if (!vm["log-level"].defaulted()) if (!vm["log-level"].defaulted())
{ {
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());