mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
Network 1.7; Quieted the debug a bit.
Really really finall version of this changes I hope.
This commit is contained in:
parent
391c7f9612
commit
618f20ce49
@ -322,9 +322,9 @@ void cLogger::SetStreamBroken(const std::string &msg) {
|
|||||||
_dbg_dbg("Stream is broken (msg: " << msg << ")");
|
_dbg_dbg("Stream is broken (msg: " << msg << ")");
|
||||||
if (!mIsBroken) { // if not already marked as broken
|
if (!mIsBroken) { // if not already marked as broken
|
||||||
_dbg_dbg("(It was not broken before)");
|
_dbg_dbg("(It was not broken before)");
|
||||||
std::cerr << OT_CODE_STAMP << "WARNING: due to debug stream problem ("<<msg<<") - switching back to fallback stream (e.g. cerr)" << std::endl;
|
std::cerr << OT_CODE_STAMP << "WARNING: due to a problem in the debug/logging system itself ("<<msg<<") - we are switching back to fallback stream (e.g. cerr)" << std::endl;
|
||||||
if (mStreamBrokenDebug == nullptr) {
|
if (mStreamBrokenDebug == nullptr) {
|
||||||
std::cerr << OT_CODE_STAMP << " ERROR: in addition, while reporting this problem, mStreamBrokenDebug stream is NULL." << std::endl;
|
std::cerr << OT_CODE_STAMP << " ERROR: in addition, while reporting this problem, mStreamBrokenDebug stream is NULL: " << mStreamBrokenDebug << std::endl;
|
||||||
} else {
|
} else {
|
||||||
(*mStreamBrokenDebug) << OT_CODE_STAMP << "WARNING: due to debug stream problem ("<<msg<<") - switching back to fallback stream (e.g. cerr)" << std::endl;
|
(*mStreamBrokenDebug) << OT_CODE_STAMP << "WARNING: due to debug stream problem ("<<msg<<") - switching back to fallback stream (e.g. cerr)" << std::endl;
|
||||||
}
|
}
|
||||||
@ -401,7 +401,7 @@ void cLogger::OpenNewChannel_(const std::string & channel) { // channel=="net/sl
|
|||||||
_dbg_dbg("Openning fname_system="<<fname_system);
|
_dbg_dbg("Openning fname_system="<<fname_system);
|
||||||
std::ofstream * thefile = new std::ofstream( fname_system.c_str() ); // file system
|
std::ofstream * thefile = new std::ofstream( fname_system.c_str() ); // file system
|
||||||
*thefile << "====== Log opened: " << fname_system << " (in " << ((void*)thefile) << ") ======" << endl;
|
*thefile << "====== Log opened: " << fname_system << " (in " << ((void*)thefile) << ") ======" << endl;
|
||||||
cerr << "====== Log opened: " << fname_system << " (in " << ((void*)thefile) << ") ======" << endl;
|
// cerr << "====== Log opened: " << fname_system << " (in " << ((void*)thefile) << ") ======" << endl;
|
||||||
_dbg_dbg( "====== Log opened: " << fname_system << " (in " << ((void*)thefile) << ") ======" );
|
_dbg_dbg( "====== Log opened: " << fname_system << " (in " << ((void*)thefile) << ") ======" );
|
||||||
mChannels.insert( std::pair<string,std::ofstream*>(channel , thefile ) ); // <- created the channel mapping
|
mChannels.insert( std::pair<string,std::ofstream*>(channel , thefile ) ); // <- created the channel mapping
|
||||||
}
|
}
|
||||||
@ -521,7 +521,7 @@ int cLogger::Thread2Number(const std::thread::id id) {
|
|||||||
if (found == mThread2Number.end()) { // new one
|
if (found == mThread2Number.end()) { // new one
|
||||||
mThread2Number_Biggest++;
|
mThread2Number_Biggest++;
|
||||||
mThread2Number[id] = mThread2Number_Biggest;
|
mThread2Number[id] = mThread2Number_Biggest;
|
||||||
_mark_c("dbg/main", "This is a new thread (used in debug), thread id="<<id); // can cause some recursion
|
_info_c("dbg/main", "This is a new thread (used in debug), thread id="<<id); // can cause some recursion
|
||||||
return mThread2Number_Biggest;
|
return mThread2Number_Biggest;
|
||||||
} else {
|
} else {
|
||||||
return mThread2Number[id];
|
return mThread2Number[id];
|
||||||
@ -533,7 +533,7 @@ int cLogger::Pid2Number(const t_anypid id) {
|
|||||||
if (found == mPid2Number.end()) { // new one
|
if (found == mPid2Number.end()) { // new one
|
||||||
mPid2Number_Biggest++;
|
mPid2Number_Biggest++;
|
||||||
mPid2Number[id] = mPid2Number_Biggest;
|
mPid2Number[id] = mPid2Number_Biggest;
|
||||||
_mark_c("dbg/main", "This is a new process (used in debug), process pid="<<id); // can cause some recursion
|
_info_c("dbg/main", "This is a new process (used in debug), process pid="<<id); // can cause some recursion
|
||||||
return mPid2Number_Biggest;
|
return mPid2Number_Biggest;
|
||||||
} else {
|
} else {
|
||||||
return mPid2Number[id];
|
return mPid2Number[id];
|
||||||
|
@ -50,6 +50,9 @@ int main(int argc, char const * argv[])
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
_note_c("dbg/main", "Begin of main()");
|
||||||
|
// TODO parse the debug options like set log level right here at start
|
||||||
|
|
||||||
epee::string_tools::set_module_name_and_folder(argv[0]);
|
epee::string_tools::set_module_name_and_folder(argv[0]);
|
||||||
|
|
||||||
// Build argument description
|
// Build argument description
|
||||||
@ -230,7 +233,8 @@ int main(int argc, char const * argv[])
|
|||||||
, log_file_path.parent_path().string().c_str()
|
, log_file_path.parent_path().string().c_str()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
_erro("Test error");
|
|
||||||
|
_note_c("dbg/main", "Moving from main() into the daemonize now.");
|
||||||
|
|
||||||
return daemonizer::daemonize(argc, argv, daemonize::t_executor{}, vm);
|
return daemonizer::daemonize(argc, argv, daemonize::t_executor{}, vm);
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ namespace net_utils
|
|||||||
}
|
}
|
||||||
|
|
||||||
data_logger::data_logger() {
|
data_logger::data_logger() {
|
||||||
_warn_c("dbg/data","Starting data logger (for graphs data)");
|
_note_c("dbg/data","Starting data logger (for graphs data)");
|
||||||
if (m_state != data_logger_state::state_during_init) { _erro_c("dbg/data","Singleton ctor state"); throw std::runtime_error("data_logger ctor state"); }
|
if (m_state != data_logger_state::state_during_init) { _erro_c("dbg/data","Singleton ctor state"); throw std::runtime_error("data_logger ctor state"); }
|
||||||
std::lock_guard<std::mutex> lock(mMutex); // lock
|
std::lock_guard<std::mutex> lock(mMutex); // lock
|
||||||
|
|
||||||
@ -55,19 +55,19 @@ namespace net_utils
|
|||||||
|
|
||||||
// do NOT modify mFilesMap below this point, since there is no locking for this used (yet)
|
// do NOT modify mFilesMap below this point, since there is no locking for this used (yet)
|
||||||
|
|
||||||
_note_c("dbg/data","Creating thread for data logger"); // create timer thread
|
_info_c("dbg/data","Creating thread for data logger"); // create timer thread
|
||||||
m_thread_maybe_running=true;
|
m_thread_maybe_running=true;
|
||||||
std::shared_ptr<std::thread> logger_thread(new std::thread([&]() {
|
std::shared_ptr<std::thread> logger_thread(new std::thread([&]() {
|
||||||
_note_c("dbg/data","Inside thread for data logger");
|
_info_c("dbg/data","Inside thread for data logger");
|
||||||
while (m_state == data_logger_state::state_during_init) { // wait for creation to be done (in other thread, in singleton) before actually running
|
while (m_state == data_logger_state::state_during_init) { // wait for creation to be done (in other thread, in singleton) before actually running
|
||||||
std::this_thread::sleep_for(std::chrono::seconds(1));
|
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||||
}
|
}
|
||||||
_note_c("dbg/data","Inside thread for data logger - going into main loop");
|
_info_c("dbg/data","Inside thread for data logger - going into main loop");
|
||||||
while (m_state == data_logger_state::state_ready_to_use) { // run as long as we are not closing the single object
|
while (m_state == data_logger_state::state_ready_to_use) { // run as long as we are not closing the single object
|
||||||
std::this_thread::sleep_for(std::chrono::seconds(1));
|
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||||
saveToFile(); // save all the pending data
|
saveToFile(); // save all the pending data
|
||||||
}
|
}
|
||||||
_note_c("dbg/data","Inside thread for data logger - done the main loop");
|
_info_c("dbg/data","Inside thread for data logger - done the main loop");
|
||||||
m_thread_maybe_running=false;
|
m_thread_maybe_running=false;
|
||||||
}));
|
}));
|
||||||
logger_thread->detach();
|
logger_thread->detach();
|
||||||
|
Loading…
Reference in New Issue
Block a user