Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a few more error messages moved to log level 1

This commit is contained in:
fluffypony 2014-09-09 12:28:16 +02:00
parent cf5a8b1d6c
commit 4ba680f294
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cryptonote_core/blockchain_storage.cpp
View File

@ -468,7 +468,7 @@ bool blockchain_storage::switch_to_alternative_blockchain(std::list<blocks_ext_b
bool r = handle_alternative_block(old_ch_ent, get_block_hash(old_ch_ent), bvc); bool r = handle_alternative_block(old_ch_ent, get_block_hash(old_ch_ent), bvc);
if(!r) if(!r)
{ {
LOG_ERROR("Failed to push ex-main chain blocks to alternative chain "); LOG_PRINT_L1("Failed to push ex-main chain blocks to alternative chain ");
rollback_blockchain_switching(disconnected_chain, split_height); rollback_blockchain_switching(disconnected_chain, split_height);
return false; return false;
} }
@ -568,12 +568,12 @@ bool blockchain_storage::validate_miner_transaction(const block& b, size_t cumul
} }
if(base_reward + fee < money_in_use) if(base_reward + fee < money_in_use)
{ {
LOG_ERROR("coinbase transaction spend too much money (" << print_money(money_in_use) << "). Block reward is " << print_money(base_reward + fee) << "(" << print_money(base_reward) << "+" << print_money(fee) << ")"); LOG_PRINT_L1("coinbase transaction spend too much money (" << print_money(money_in_use) << "). Block reward is " << print_money(base_reward + fee) << "(" << print_money(base_reward) << "+" << print_money(fee) << ")");
return false; return false;
} }
if(base_reward + fee != money_in_use) if(base_reward + fee != money_in_use)
{ {
LOG_ERROR("coinbase transaction doesn't use full amount of block reward: spent: " LOG_PRINT_L1("coinbase transaction doesn't use full amount of block reward: spent: "
<< print_money(money_in_use) << ", block reward " << print_money(base_reward + fee) << "(" << print_money(base_reward) << "+" << print_money(fee) << ")"); << print_money(money_in_use) << ", block reward " << print_money(base_reward + fee) << "(" << print_money(base_reward) << "+" << print_money(fee) << ")");
return false; return false;
} }
@ -751,7 +751,7 @@ bool blockchain_storage::handle_alternative_block(const block& b, const crypto::
uint64_t block_height = get_block_height(b); uint64_t block_height = get_block_height(b);
if(0 == block_height) if(0 == block_height)
{ {
LOG_ERROR("Block with id: " << epee::string_tools::pod_to_hex(id) << " (as alternative) has wrong miner transaction"); LOG_PRINT_L1("Block with id: " << epee::string_tools::pod_to_hex(id) << " (as alternative) has wrong miner transaction");
bvc.m_verifivation_failed = true; bvc.m_verifivation_failed = true;
return false; return false;
} }
@ -1015,7 +1015,7 @@ bool blockchain_storage::get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDO
auto it = m_outputs.find(amount); auto it = m_outputs.find(amount);
if(it == m_outputs.end()) if(it == m_outputs.end())
{ {
LOG_ERROR("COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS: not outs for amount " << amount << ", wallet should use some real outs when it lookup for some mix, so, at least one out for this amount should exist"); LOG_PRINT_L1("COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS: not outs for amount " << amount << ", wallet should use some real outs when it lookup for some mix, so, at least one out for this amount should exist");
continue;//actually this is strange situation, wallet should use some real outs when it lookup for some mix, so, at least one out for this amount should exist continue;//actually this is strange situation, wallet should use some real outs when it lookup for some mix, so, at least one out for this amount should exist
} }
std::vector<std::pair<crypto::hash, size_t> >& amount_outs = it->second; std::vector<std::pair<crypto::hash, size_t> >& amount_outs = it->second;
@ -1053,13 +1053,13 @@ bool blockchain_storage::find_blockchain_supplement(const std::list<crypto::hash
if(!qblock_ids.size() /*|| !req.m_total_height*/) if(!qblock_ids.size() /*|| !req.m_total_height*/)
{ {
LOG_ERROR("Client sent wrong NOTIFY_REQUEST_CHAIN: m_block_ids.size()=" << qblock_ids.size() << /*", m_height=" << req.m_total_height <<*/ ", dropping connection"); LOG_PRINT_L1("Client sent wrong NOTIFY_REQUEST_CHAIN: m_block_ids.size()=" << qblock_ids.size() << /*", m_height=" << req.m_total_height <<*/ ", dropping connection");
return false; return false;
} }
//check genesis match //check genesis match
if(qblock_ids.back() != get_block_hash(m_blocks[0].bl)) if(qblock_ids.back() != get_block_hash(m_blocks[0].bl))
{ {
LOG_ERROR("Client sent wrong NOTIFY_REQUEST_CHAIN: genesis block missmatch: " << ENDL << "id: " LOG_PRINT_L1("Client sent wrong NOTIFY_REQUEST_CHAIN: genesis block missmatch: " << ENDL << "id: "
<< qblock_ids.back() << ", " << ENDL << "expected: " << get_block_hash(m_blocks[0].bl) << qblock_ids.back() << ", " << ENDL << "expected: " << get_block_hash(m_blocks[0].bl)
<< "," << ENDL << " dropping connection"); << "," << ENDL << " dropping connection");
return false; return false;
@ -1078,14 +1078,14 @@ bool blockchain_storage::find_blockchain_supplement(const std::list<crypto::hash
if(bl_it == qblock_ids.end()) if(bl_it == qblock_ids.end())
{ {
LOG_ERROR("Internal error handling connection, can't find split point"); LOG_PRINT_L1("Internal error handling connection, can't find split point");
return false; return false;
} }
if(block_index_it == m_blocks_index.end()) if(block_index_it == m_blocks_index.end())
{ {
//this should NEVER happen, but, dose of paranoia in such cases is not too bad //this should NEVER happen, but, dose of paranoia in such cases is not too bad
LOG_ERROR("Internal error handling connection, can't find split point"); LOG_PRINT_L1("Internal error handling connection, can't find split point");
return false; return false;
} }
@ -1321,7 +1321,7 @@ bool blockchain_storage::add_transaction_from_block(const transaction& tx, const
{ {
if(!boost::apply_visitor(add_transaction_input_visitor(m_spent_keys, tx_id, bl_id), in)) if(!boost::apply_visitor(add_transaction_input_visitor(m_spent_keys, tx_id, bl_id), in))
{ {
LOG_ERROR("critical internal error: add_transaction_input_visitor failed. but here key_images should be shecked"); LOG_PRINT_L1("critical internal error: add_transaction_input_visitor failed. but here key_images should be checked");
purge_transaction_keyimages_from_blockchain(tx, false); purge_transaction_keyimages_from_blockchain(tx, false);
return false; return false;
} }
@ -1669,7 +1669,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
auto ind_res = m_blocks_index.insert(std::pair<crypto::hash, size_t>(id, bei.height)); auto ind_res = m_blocks_index.insert(std::pair<crypto::hash, size_t>(id, bei.height));
if(!ind_res.second) if(!ind_res.second)
{ {
LOG_ERROR("block with id: " << id << " already in block indexes"); LOG_PRINT_L1("block with id: " << id << " already in block indexes");
purge_block_data_from_blockchain(bl, tx_processed_count); purge_block_data_from_blockchain(bl, tx_processed_count);
bvc.m_verifivation_failed = true; bvc.m_verifivation_failed = true;
return false; return false;

8
src/cryptonote_core/tx_pool.cpp
View File

@ -88,14 +88,14 @@ namespace cryptonote
uint64_t fee = inputs_amount - outputs_amount; uint64_t fee = inputs_amount - outputs_amount;
if (!kept_by_block && fee < DEFAULT_FEE) if (!kept_by_block && fee < DEFAULT_FEE)
{ {
LOG_ERROR("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(DEFAULT_FEE)); LOG_PRINT_L1("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(DEFAULT_FEE));
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;
return false; return false;
} }
if (!kept_by_block && blob_size >= TRANSACTION_SIZE_LIMIT) if (!kept_by_block && blob_size >= TRANSACTION_SIZE_LIMIT)
{ {
LOG_ERROR("transaction is too big: " << blob_size << " bytes, maximum size: " << TRANSACTION_SIZE_LIMIT); LOG_PRINT_L1("transaction is too big: " << blob_size << " bytes, maximum size: " << TRANSACTION_SIZE_LIMIT);
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;
return false; return false;
} }
@ -105,7 +105,7 @@ namespace cryptonote
{ {
if(have_tx_keyimges_as_spent(tx)) if(have_tx_keyimges_as_spent(tx))
{ {
LOG_ERROR("Transaction with id= "<< id << " used already spent key images"); LOG_PRINT_L1("Transaction with id= "<< id << " used already spent key images");
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;
return false; return false;
} }
@ -467,7 +467,7 @@ namespace cryptonote
bool res = tools::unserialize_obj_from_file(*this, state_file_path); bool res = tools::unserialize_obj_from_file(*this, state_file_path);
if(!res) if(!res)
{ {
LOG_ERROR("Failed to load memory pool from file " << state_file_path); LOG_PRINT_L1("Failed to load memory pool from file " << state_file_path);
m_transactions.clear(); m_transactions.clear();
m_spent_key_images.clear(); m_spent_key_images.clear();