Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1718

Browse Source 
882db8e9 tools: log to the correct file (moneromooo-monero)
142e5e1e tools: set requested log level (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-12 23:28:56 +02:00
commit 6e78915061
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blockchain_utilities/blockchain_export.cpp
View File

@ -57,6 +57,8 @@ std::string join_set_strings(const std::unordered_set<std::string>& db_types_all
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
epee::string_tools::set_module_name_and_folder(argv[0]);
std::string default_db_type = "lmdb"; std::string default_db_type = "lmdb";
std::unordered_set<std::string> db_types_all = cryptonote::blockchain_db_types; std::unordered_set<std::string> db_types_all = cryptonote::blockchain_db_types;
@ -125,7 +127,8 @@ int main(int argc, char* argv[])
log_level = command_line::get_arg(vm, arg_log_level); log_level = command_line::get_arg(vm, arg_log_level);
block_stop = command_line::get_arg(vm, arg_block_stop); block_stop = command_line::get_arg(vm, arg_block_stop);
mlog_configure("monero-blockchain-export", true); mlog_configure(mlog_get_default_log_path("monero-blockchain-export.log"), true);
mlog_set_log(std::string(std::to_string(log_level) + ",bcutil:INFO").c_str());
LOG_PRINT_L0("Starting..."); LOG_PRINT_L0("Starting...");
bool opt_testnet = command_line::get_arg(vm, arg_testnet_on); bool opt_testnet = command_line::get_arg(vm, arg_testnet_on);

7
src/blockchain_utilities/blockchain_import.cpp
View File

@ -374,7 +374,7 @@ int import_from_file(FakeCore& simple_core, const std::string& import_file_path,
return 2; return 2;
} }
bytes_read += chunk_size; bytes_read += chunk_size;
MINFO("Total bytes read: " << bytes_read); MDEBUG("Total bytes read: " << bytes_read);
if (h + NUM_BLOCKS_PER_CHUNK < start_height + 1) if (h + NUM_BLOCKS_PER_CHUNK < start_height + 1)
{ {
@ -596,6 +596,8 @@ int import_from_file(FakeCore& simple_core, const std::string& import_file_path,
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
epee::string_tools::set_module_name_and_folder(argv[0]);
std::string default_db_type = "lmdb"; std::string default_db_type = "lmdb";
std::string default_db_engine_compiled = "blockchain_db"; std::string default_db_engine_compiled = "blockchain_db";
@ -722,7 +724,8 @@ int main(int argc, char* argv[])
m_config_folder = command_line::get_arg(vm, data_dir_arg); m_config_folder = command_line::get_arg(vm, data_dir_arg);
db_arg_str = command_line::get_arg(vm, arg_database); db_arg_str = command_line::get_arg(vm, arg_database);
mlog_configure("monero-blockchain-import", true); mlog_configure(mlog_get_default_log_path("monero-blockchain-import.log"), true);
mlog_set_log(std::string(std::to_string(log_level) + ",bcutil:INFO").c_str());
MINFO("Starting..."); MINFO("Starting...");
boost::filesystem::path fs_import_file_path; boost::filesystem::path fs_import_file_path;

2
src/blockchain_utilities/bootstrap_file.cpp
View File

@ -458,7 +458,7 @@ uint64_t BootstrapFile::count_blocks(const std::string& import_file_path)
bytes_read += chunk_size; bytes_read += chunk_size;
// std::cout << refresh_string; // std::cout << refresh_string;
MINFO("Number bytes scanned: " << bytes_read); MDEBUG("Number bytes scanned: " << bytes_read);
} }
import_file.close(); import_file.close();