asymptotically
/
openmonero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

futher easylogging integration

Browse Source
pull/93/merge
moneroexamples 6 years ago
parent 62480adced
commit d542aae542
4 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File

27
main.cpp
Unescape View File

@ -34,16 +34,14 @@ mlog_configure(mlog_get_default_log_path(""), true);
mlog_set_log("1");
// set logger for Open Monero
// setup a logger for Open Monero
el::Configurations defaultConf;
defaultConf.setToDefault();
defaultConf.setGlobally(el::ConfigurationType::ToFile,
std::string("false"));
defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput,
std::string("true"));
//el::Logger* omLogger = el::Loggers::getLogger("openmonero");
defaultConf.setToDefault();
//defaultConf.setGlobally(el::ConfigurationType::Filename, filename_base);
defaultConf.setGlobally(el::ConfigurationType::ToFile, "false");
defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
el::Loggers::reconfigureLogger("openmonero", defaultConf);
@ -61,8 +59,7 @@ bool stagenet = *stagenet_opt;
bool do_not_relay = *do_not_relay_opt;
if (testnet && stagenet)
{
//cerr << "testnet and stagenet cannot be specified at the same time!" << endl;
{
OMERROR << "testnet and stagenet cannot be specified at the same time!";
return EXIT_FAILURE;
}
@ -108,7 +105,6 @@ auto current_bc_status
std::make_unique<xmreg::MicroCore>(),
std::make_unique<xmreg::RPCCalls>(bc_setup.deamon_url));
// since CurrentBlockchainStatus class monitors current status
// of the blockchain (e.g., current height), its seems logical to
// make static objects for accessing the blockchain in this class.
@ -132,6 +128,7 @@ if (!current_bc_status->init_monero_blockchain())
// when they log back or create new account.
current_bc_status->start_monitor_blockchain_thread();
OMINFO << "Blockchain monitoring thread started";
// try connecting to the mysql
shared_ptr<xmreg::MySqlAccounts> mysql_accounts;
@ -140,6 +137,8 @@ try
{
// MySqlAccounts will try connecting to the mysql database
mysql_accounts = make_shared<xmreg::MySqlAccounts>(current_bc_status);
OMINFO << "Connected to the MySQL";
}
catch(std::exception const& e)
{
@ -171,6 +170,8 @@ xmreg::ThreadRAII mysql_ping_thread(
std::thread(std::ref(mysql_ping)),
xmreg::ThreadRAII::DtorAction::detach);
OMINFO << "MySQL ping thread started";
// create REST JSON API services
xmreg::YourMoneroRequests open_monero(mysql_accounts, current_bc_status);
@ -201,7 +202,9 @@ service.publish(import_recent_wallet_request);
service.publish(get_tx);
service.publish(get_version);
auto settings = make_shared<Settings>( );
OMINFO << "JSON API endpoints published";
auto settings = make_shared<Settings>();
if (config_json["ssl"]["enable"])
{
@ -228,7 +231,7 @@ if (config_json["ssl"]["enable"])
else
{
settings->set_port(app_port);
settings->set_default_header( "Connection", "close" );
settings->set_default_header("Connection", "close");
OMINFO << "Start the service at http://127.0.0.1:" << app_port;
}

83
src/CurrentBlockchainStatus.cpp
Unescape View File

@ -125,8 +125,8 @@ CurrentBlockchainStatus::get_block_txs(
if (!mcore->get_transactions(blk.tx_hashes, blk_txs, missed_txs))
{
cerr << "Cant get transactions in block: "
<< get_block_hash(blk) << endl;
OMERROR << "Cant get transactions in block: "
<< get_block_hash(blk);
return false;
}
@ -142,8 +142,8 @@ CurrentBlockchainStatus::get_txs(
{
if (!mcore->get_transactions(txs_to_get, txs, missed_txs))
{
cerr << "CurrentBlockchainStatus::get_txs: "
"cant get transactions!\n";
OMERROR << "CurrentBlockchainStatus::get_txs: "
"cant get transactions!";
return false;
}
@ -202,7 +202,7 @@ CurrentBlockchainStatus::get_tx_with_output(
amount, output_idx
);
cerr << out_msg << endl;
OMERROR << out_msg;
return false;
}
@ -211,7 +211,7 @@ CurrentBlockchainStatus::get_tx_with_output(
if (!mcore->get_tx(tx_out_idx.first, tx))
{
cerr << "Cant get tx: " << tx_out_idx.first << endl;
OMERROR << "Cant get tx: " << tx_out_idx.first;
return false;
}
@ -231,7 +231,7 @@ CurrentBlockchainStatus::get_output_keys(const uint64_t& amount,
}
catch (const OUTPUT_DNE& e)
{
cerr << "get_output_keys: " << e.what() << endl;
OMERROR << "get_output_keys: " << e.what();
}
return false;
@ -321,7 +321,7 @@ CurrentBlockchainStatus::get_random_outputs(
if (!mcore->get_random_outs_for_amounts(req, res))
{
cerr << "mcore->get_random_outs_for_amounts(req, res) failed\n";
OMERROR << "mcore->get_random_outs_for_amounts(req, res) failed";
return false;
}
@ -364,7 +364,7 @@ CurrentBlockchainStatus::get_output(
if (!mcore->get_outs(req, res))
{
cerr << "mcore->get_outs(req, res) failed\n";
OMERROR << "mcore->get_outs(req, res) failed";
return false;
}
@ -411,7 +411,7 @@ CurrentBlockchainStatus::commit_tx(
if (!rpc->commit_tx(tx_blob, error_msg, do_not_relay))
{
cerr << "rpc->commit_tx() commit_tx failed\n";
OMERROR << "rpc->commit_tx() commit_tx failed";
return false;
}
@ -427,7 +427,7 @@ CurrentBlockchainStatus::read_mempool()
if (!mcore->get_mempool_txs(mempool_tx_info, key_image_infos))
{
cerr << "Getting mempool failed " << endl;
OMERROR << "Getting mempool failed ";
return false;
}
@ -456,7 +456,7 @@ CurrentBlockchainStatus::read_mempool()
if (!parse_and_validate_tx_from_blob(
_tx_info.tx_blob, tx, tx_hash, tx_prefix_hash))
{
cerr << "Cant make tx from _tx_info.tx_blob" << endl;
OMERROR << "Cant make tx from _tx_info.tx_blob";
return false;
}
@ -504,8 +504,8 @@ CurrentBlockchainStatus::search_if_payment_made(
block blk;
if (!get_block(blk_i, blk)) {
cerr << "Cant get block of height: "
+ to_string(blk_i) << endl;
OMERROR << "Cant get block of height: "
+ to_string(blk_i);
return false;
}
@ -514,8 +514,8 @@ CurrentBlockchainStatus::search_if_payment_made(
if (!get_block_txs(blk, blk_txs, missed_txs))
{
cerr << "Cant get transactions in block: "
<< to_string(blk_i) << endl;
OMERROR << "Cant get transactions in block: "
<< to_string(blk_i);
return false;
}
@ -552,8 +552,7 @@ CurrentBlockchainStatus::search_if_payment_made(
if (!hex_to_pod(tx_payment_id_str, encrypted_payment_id8))
{
cerr << "failed parsing hex to pod for encrypted_payment_id8"
<< '\n';
OMERROR << "failed parsing hex to pod for encrypted_payment_id8";
}
// decrypt the encrypted_payment_id8
@ -570,10 +569,9 @@ CurrentBlockchainStatus::search_if_payment_made(
bc_setup.import_payment_viewkey,
derivation))
{
cerr << "Cant get derived key for: " << "\n"
<< "pub_tx_key: " << tx_pub_key << " and "
<< "prv_view_key" << bc_setup.import_payment_viewkey
<< "\n";
OMERROR << "Cant get derived key for: " << "\n"
<< "pub_tx_key: " << tx_pub_key << " and "
<< "prv_view_key" << bc_setup.import_payment_viewkey;
return false;
}
@ -587,8 +585,8 @@ CurrentBlockchainStatus::search_if_payment_made(
decrypted_payment_id8, tx_pub_key,
bc_setup.import_payment_viewkey))
{
cerr << "Cant decrypt decrypted_payment_id8: "
<< pod_to_hex(decrypted_payment_id8) << "\n";
OMERROR << "Cant decrypt decrypted_payment_id8: "
<< pod_to_hex(decrypted_payment_id8);
}
}
@ -664,7 +662,7 @@ CurrentBlockchainStatus::search_if_payment_made(
if (!r)
{
cerr << "Cant decode ringCT!" << endl;
OMERROR << "Cant decode ringCT!";
throw TxSearchException("Cant decode ringCT!");
}
@ -681,9 +679,9 @@ CurrentBlockchainStatus::search_if_payment_made(
}
}
cout << " - payment id check in tx: "
<< tx_hash_str
<< " found: " << total_received << endl;
OMINFO << " - payment id check in tx: "
<< tx_hash_str
<< " found: " << total_received;
if (total_received >= desired_amount)
{
@ -751,7 +749,7 @@ CurrentBlockchainStatus::start_tx_search_thread(XmrAccount acc)
}
catch (const std::exception& e)
{
cerr << "Faild created a search thread: " << e.what() << endl;
OMERROR << "Faild created a search thread: " << e.what();
return false;
}
@ -762,7 +760,7 @@ CurrentBlockchainStatus::start_tx_search_thread(XmrAccount acc)
t1.detach();
cout << "Search thread created\n";
OMINFO << "Search thread created for address " << acc.address;
return true;
}
@ -777,7 +775,7 @@ CurrentBlockchainStatus::ping_search_thread(const string& address)
if (!search_thread_exist(address))
{
// thread does not exist
cout << "thread for " << address << " does not exist\n";
OMERROR << "thread for " << address << " does not exist";
return false;
}
@ -795,7 +793,7 @@ CurrentBlockchainStatus::get_searched_blk_no(const string& address,
if (!search_thread_exist(address))
{
// thread does not exist
cout << "thread for " << address << " does not exist\n";
OMERROR << "thread for " << address << " does not exist";
return false;
}
@ -815,7 +813,7 @@ CurrentBlockchainStatus::get_known_outputs_keys(
if (!search_thread_exist(address))
{
// thread does not exist
cout << "thread for " << address << " does not exist\n";
OMERROR << "thread for " << address << " does not exist";
return false;
}
@ -846,7 +844,7 @@ CurrentBlockchainStatus::get_xmr_address_viewkey(
if (!search_thread_exist(address_str))
{
// thread does not exist
cout << "thread for " << address_str << " does not exist\n";
OMERROR << "thread for " << address_str << " does not exist";
return false;
}
@ -868,7 +866,7 @@ CurrentBlockchainStatus::find_txs_in_mempool(
if (searching_threads.count(address_str) == 0)
{
// thread does not exist
cout << "thread for " << address_str << " does not exist\n";
OMERROR << "thread for " << address_str << " does not exist";
return false;
}
@ -1000,7 +998,7 @@ CurrentBlockchainStatus::set_new_searched_blk_no(
if (searching_threads.count(address) == 0)
{
// thread does not exist
cout << " thread does not exist" << endl;
OMERROR << " thread does not exist";
return false;
}
@ -1020,8 +1018,8 @@ CurrentBlockchainStatus::clean_search_thread_map()
if (search_thread_exist(st.first)
&& st.second->still_searching() == false)
{
cout << st.first << " still searching: "
<< st.second->still_searching() << endl;
OMERROR << st.first << " still searching: "
<< st.second->still_searching();
searching_threads.erase(st.first);
}
}
@ -1044,21 +1042,16 @@ CurrentBlockchainStatus::construct_output_rct_field(
global_amount_index, out_amount,
random_output_tx, output_idx_in_tx))
{
cerr << "cant get random output transaction" << endl;
OMERROR << "cant get random output transaction";
return make_tuple(string {}, string {}, string {});
}
//cout << pod_to_hex(out.out_key) << endl;
//cout << pod_to_hex(get_transaction_hash(random_output_tx)) << endl;
//cout << output_idx_in_tx << endl;
// placeholder variable for ringct outputs info
// that we need to save in database
string rtc_outpk;
string rtc_mask(64, '0');
string rtc_amount(64, '0');
if (random_output_tx.version > 1 && !is_coinbase(random_output_tx))
{
rtc_outpk = pod_to_hex(random_output_tx.rct_signatures
@ -1138,7 +1131,7 @@ CurrentBlockchainStatus::get_txs_in_blocks(
if (!CurrentBlockchainStatus::get_txs(txs_to_get, txs, missed_txs)
|| !missed_txs.empty())
{
cerr << "Cant get transactions in blocks from : " << h1 << '\n';
OMERROR << "Cant get transactions in blocks from : " << h1;
return false;
}

7
src/TxSearch.cpp
Unescape View File

@ -27,13 +27,13 @@ TxSearch::TxSearch(XmrAccount& _acc, std::shared_ptr<CurrentBlockchainStatus> _c
if (!xmreg::parse_str_address(acc->address, address, net_type))
{
cerr << "Cant parse string address: " << acc->address << endl;
OMERROR << "Cant parse string address: " << acc->address;
throw TxSearchException("Cant parse string address: " + acc->address);
}
if (!xmreg::parse_str_secret_key(acc->viewkey, viewkey))
{
cerr << "Cant parse the private key: " << acc->viewkey << endl;
OMERROR << "Cant parse the private key: " << acc->viewkey;
throw TxSearchException("Cant parse private key: " + acc->viewkey);
}
@ -92,7 +92,8 @@ TxSearch::search()
// stop the thread
if (loop_timestamp - last_ping_timestamp > thread_search_life)
{
cout << "Search thread stopped for address "<< acc->address <<'\n';
OMINFO << "Search thread stopped for address "
<< acc->address;
stop();
}

5
src/om_log.h
Unescape View File

@ -7,4 +7,9 @@
#define OMWARN CLOG(WARNING, OPENMONERO_LOG_CATEGORY)
#define OMERROR CLOG(ERROR, OPENMONERO_LOG_CATEGORY)
#define OMINFO_IF(cond) CLOG_IF(cond, INFO, OPENMONERO_LOG_CATEGORY)
#define OMWARN_IF(cond) CLOG_IF(cond, WARNING, OPENMONERO_LOG_CATEGORY)
#define OMERROR_IF(cond) CLOG_IF(cond, ERROR, OPENMONERO_LOG_CATEGORY)
#endif // OM_LOG_H

Write Preview
Loading…
Cancel
Save