nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4742

Browse Source 
0a95cdaa blockchain_utilities: fix logs and cout output colliding (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-11-06 21:32:54 +02:00
commit da26bc92e9
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blockchain_utilities/blockchain_import.cpp
View File

@ -396,7 +396,7 @@ int import_from_file(cryptonote::core& core, const std::string& import_file_path
{ {
std::cout << refresh_string << "block " << h-1 std::cout << refresh_string << "block " << h-1
<< " / " << block_stop << " / " << block_stop
<< std::flush; << "\r" << std::flush;
std::cout << ENDL << ENDL; std::cout << ENDL << ENDL;
MINFO("Specified block number reached - stopping. block: " << h-1 << " total blocks: " << h); MINFO("Specified block number reached - stopping. block: " << h-1 << " total blocks: " << h);
quit = 1; quit = 1;
@ -432,7 +432,7 @@ int import_from_file(cryptonote::core& core, const std::string& import_file_path
{ {
std::cout << refresh_string << "block " << h-1 std::cout << refresh_string << "block " << h-1
<< " / " << block_stop << " / " << block_stop
<< std::flush; << "\r" << std::flush;
} }
if (opt_verify) if (opt_verify)

4
src/blockchain_utilities/bootstrap_file.cpp
View File

@ -304,7 +304,7 @@ bool BootstrapFile::store_blockchain_raw(Blockchain* _blockchain_storage, tx_mem
} }
if (m_cur_height % progress_interval == 0) { if (m_cur_height % progress_interval == 0) {
std::cout << refresh_string; std::cout << refresh_string;
std::cout << "block " << m_cur_height << "/" << block_stop << std::flush; std::cout << "block " << m_cur_height << "/" << block_stop << "\r" << std::flush;
} }
} }
// NOTE: use of NUM_BLOCKS_PER_CHUNK is a placeholder in case multi-block chunks are later supported. // NOTE: use of NUM_BLOCKS_PER_CHUNK is a placeholder in case multi-block chunks are later supported.
@ -479,7 +479,7 @@ uint64_t BootstrapFile::count_blocks(const std::string& import_file_path, std::s
bytes_read += count_bytes(import_file, progress_interval, blocks, quit); bytes_read += count_bytes(import_file, progress_interval, blocks, quit);
h += blocks; h += blocks;
std::cout << "\r" << "block height: " << h-1 << std::cout << "\r" << "block height: " << h-1 <<
" " << " \r" <<
std::flush; std::flush;
// std::cout << refresh_string; // std::cout << refresh_string;