Log console output during replay to file #985 #1355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pmconrad
reviewed
Oct 1, 2018
libraries/app/application.cpp
Outdated
| } | ||
| if( modified_genesis ) | ||
| { | ||
| std::cerr << "WARNING: GENESIS WAS MODIFIED, YOUR CHAIN ID MAY BE DIFFERENT\n"; | ||
| ilog("WARNING: GENESIS WAS MODIFIED, YOUR CHAIN ID MAY BE DIFFERENT\n"); |
pmconrad
reviewed
Oct 1, 2018
libraries/app/application.cpp
Outdated
| @@ -982,16 +985,18 @@ void application::initialize(const fc::path& data_dir, const boost::program_opti | |||
| try { | |||
| genesis_state = fc::json::from_file(genesis_out).as<genesis_state_type>( 20 ); | |||
| } catch(const fc::exception& e) { | |||
| std::cerr << "Unable to parse existing genesis file:\n" << e.to_string() | |||
| << "\nWould you like to replace it? [y/N] "; | |||
| ilog( | |||
There was a problem hiding this comment.
This prompts for user input, please change back to original.
pmconrad
reviewed
Oct 1, 2018
| if( db.get_slot_at_time( fc::time_point::now() ) > 200 ) | ||
| { | ||
| std::cerr << "Your genesis seems to have an old timestamp\n" | ||
| ilog("Your genesis seems to have an old timestamp\n" |
abitmore
reviewed
Oct 1, 2018
libraries/app/application.cpp
Outdated
| } | ||
| if( _options->count("dbg-init-key") ) | ||
| { | ||
| std::string init_key = _options->at( "dbg-init-key" ).as<string>(); | ||
| FC_ASSERT( genesis.initial_witness_candidates.size() >= genesis.initial_active_witnesses ); | ||
| set_dbg_init_key( genesis, init_key ); | ||
| modified_genesis = true; | ||
| std::cerr << "Set init witness key to " << init_key << "\n"; | ||
| ilog("Set init witness key to ${init_key}\n", ("init_key", init_key)); |
There was a problem hiding this comment.
fixed in new commit. Thanks !
| ilog( | ||
| "Used genesis timestamp: ${timestamp} (PLEASE RECORD THIS)\n", | ||
| ("timestamp", genesis.initial_timestamp.to_iso_string()) | ||
| ); |
There was a problem hiding this comment.
fixed in new commit. Thanks !
libraries/app/application.cpp
Outdated
| @@ -989,9 +992,9 @@ void application::initialize(const fc::path& data_dir, const boost::program_opti | |||
| return; | |||
| } | |||
|
|
|||
| std::cerr << "Updating genesis state in file " << genesis_out.generic_string() << "\n"; | |||
| ilog("Updating genesis state in file ${genesis_out} \n", ("genesis_out", genesis_out.generic_string())); | |||
There was a problem hiding this comment.
I don't think here and below should be changed to ilog. @pmconrad what's your opinion?
There was a problem hiding this comment.
fixed in new commit. Thanks !
| if( db.get_slot_at_time( fc::time_point::now() ) > 200 ) | ||
| { | ||
| std::cerr << "Your genesis seems to have an old timestamp\n" | ||
| wlog("Your genesis seems to have an old timestamp\n" |
There was a problem hiding this comment.
Personally I think having \n in the middle of a log message is a bit strange. What's your opinion?
There was a problem hiding this comment.
fixed in new commit. Thanks !
libraries/app/application.cpp
Outdated
| } | ||
| if( modified_genesis ) | ||
| { | ||
| std::cerr << "WARNING: GENESIS WAS MODIFIED, YOUR CHAIN ID MAY BE DIFFERENT\n"; | ||
| wlog("WARNING: GENESIS WAS MODIFIED, YOUR CHAIN ID MAY BE DIFFERENT\n"); |
There was a problem hiding this comment.
fixed in new commit. Thanks !
|
Thanks ! |
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR for #985 "Log console output during replay to file"
bump fc and changed (std::cerr) to (ilog) in application.cpp and witness.cpp