Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade log library to v2.0.0 #826

Merged
merged 4 commits into from
Oct 3, 2023
Merged

Upgrade log library to v2.0.0 #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b348200
Upgrade log library to v2.0.0
sgerbino Sep 29, 2023
ae16345
Updated to include log-datetime flag
sgerbino Oct 2, 2023
cf7b787
Declare log_datetime
sgerbino Oct 2, 2023
71baed3
Bump log library to v2.0.0
sgerbino Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ HunterGate(
LOCAL
)

project(koinos_chain VERSION 1.1.0 LANGUAGES CXX C)
project(koinos_chain VERSION 1.2.0 LANGUAGES CXX C)
add_compile_definitions(KOINOS_MAJOR_VERSION=${PROJECT_VERSION_MAJOR})
add_compile_definitions(KOINOS_MINOR_VERSION=${PROJECT_VERSION_MINOR})
add_compile_definitions(KOINOS_PATCH_VERSION=${PROJECT_VERSION_PATCH})
Expand Down
2 changes: 1 addition & 1 deletion libraries/log
Open in desktop
Submodule log updated 7 files
+19 −0 .github/workflows/add_issue_to_project.yml
+17 −0 .github/workflows/add_pr_to_project.yml
+17 −3 .github/workflows/close_issues.yml
+1 −1 CMakeLists.txt
+2 −2 libraries/log/include/koinos/log.hpp
+37 −25 libraries/log/log.cpp
+6 −6 tests/tests/log_test.cpp
28 changes: 24 additions & 4 deletions programs/koinos_chain/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
#define AMQP_DEFAULT "amqp://guest:guest@localhost:5672/"
#define LOG_LEVEL_OPTION "log-level"
#define LOG_LEVEL_DEFAULT "info"
#define LOG_DIR_OPTION "log-dir"
#define LOG_DIR_DEFAULT ""
#define LOG_COLOR_OPTION "log-color"
#define LOG_COLOR_DEFAULT true
#define LOG_DATETIME_OPTION "log-datetime"
#define LOG_DATETIME_DEFAULT true
#define INSTANCE_ID_OPTION "instance-id"
#define STATEDIR_OPTION "statedir"
#define JOBS_OPTION "jobs"
Expand All @@ -72,11 +78,11 @@ void attach_request_handler( chain::controller& controller, mq::request_handler&

int main( int argc, char** argv )
{
std::string amqp_url, log_level, instance_id, fork_algorithm_option;
std::string amqp_url, log_level, log_dir, instance_id, fork_algorithm_option;
std::filesystem::path statedir, genesis_data_file;
uint64_t jobs, read_compute_limit;
chain::genesis_data genesis_data;
bool reset;
bool reset, log_color, log_datetime;
chain::fork_resolution_algorithm fork_algorithm;

try
Expand All @@ -96,7 +102,10 @@ int main( int argc, char** argv )
(STATEDIR_OPTION , program_options::value< std::string >(),
"The location of the blockchain state files (absolute path or relative to basedir/chain)")
(RESET_OPTION , program_options::value< bool >(), "Reset the database")
(FORK_ALGORITHM_OPTION ",f", program_options::value< std::string >(), "The fork resolution algorithm to use. Can be 'fifo', 'pob', or 'block-time'. (Default: 'fifo')");
(FORK_ALGORITHM_OPTION ",f", program_options::value< std::string >(), "The fork resolution algorithm to use. Can be 'fifo', 'pob', or 'block-time'. (Default: 'fifo')")
(LOG_DIR_OPTION , program_options::value< std::string >(), "The logging directory")
(LOG_COLOR_OPTION , program_options::value< bool >(), "Log color toggle")
(LOG_DATETIME_OPTION , program_options::value< bool >(), "Log datetime on console toggle");

program_options::variables_map args;
program_options::store( program_options::parse_command_line( argc, argv, options ), args );
Expand Down Expand Up @@ -138,6 +147,9 @@ int main( int argc, char** argv )

amqp_url = util::get_option< std::string >( AMQP_OPTION, AMQP_DEFAULT, args, chain_config, global_config );
log_level = util::get_option< std::string >( LOG_LEVEL_OPTION, LOG_LEVEL_DEFAULT, args, chain_config, global_config );
log_dir = util::get_option< std::string >( LOG_DIR_OPTION, LOG_DIR_DEFAULT, args, chain_config, global_config );
log_color = util::get_option< bool >( LOG_COLOR_OPTION, LOG_COLOR_DEFAULT, args, chain_config, global_config );
log_datetime = util::get_option< bool >( LOG_DATETIME_OPTION, LOG_DATETIME_DEFAULT, args, chain_config, global_config );
instance_id = util::get_option< std::string >( INSTANCE_ID_OPTION, util::random_alphanumeric( 5 ), args, chain_config, global_config );
statedir = std::filesystem::path( util::get_option< std::string >( STATEDIR_OPTION, STATEDIR_DEFAULT, args, chain_config, global_config ) );
genesis_data_file = std::filesystem::path( util::get_option< std::string >( GENESIS_DATA_FILE_OPTION, GENESIS_DATA_FILE_DEFAULT, args, chain_config, global_config ) );
Expand All @@ -146,7 +158,15 @@ int main( int argc, char** argv )
read_compute_limit = util::get_option< uint64_t >( READ_COMPUTE_BANDWITH_LIMIT_OPTION, READ_COMPUTE_BANDWITH_LIMIT_DEFAULT, args, chain_config, global_config );
fork_algorithm_option = util::get_option< std::string >( FORK_ALGORITHM_OPTION, FORK_ALGORITHM_DEFAULT, args, chain_config, global_config );

koinos::initialize_logging( util::service::chain, instance_id, log_level, basedir / util::service::chain / "logs" );
std::optional< std::filesystem::path > logdir_path;
if ( !log_dir.empty() )
{
logdir_path = std::make_optional< std::filesystem::path >( log_dir );
if ( logdir_path->is_relative() )
logdir_path = basedir / util::service::chain / *logdir_path;
}

koinos::initialize_logging( util::service::chain, instance_id, log_level, logdir_path, log_color, log_datetime );

LOG(info) << version_string();

Expand Down