public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- minor cleanup 

- log time instead of timestamp
This commit is contained in:
Dmytro Bogovych 2020-09-15 12:43:31 +03:00
parent a1323585a1
commit d2096b17e6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/ice/ICELog.cpp
View File

@ -191,7 +191,7 @@ void Logger::beginLine(LogLevel level, const char* filename, int linenumber, con
mLine = linenumber; mLine = linenumber;
mSubsystem = subsystem; mSubsystem = subsystem;
//*mStream << std::setw(8) << ICETimeHelper::timestamp() << " | " << std::setw(8) << ThreadInfo::currentThread() << " | " << std::setw(30) << filenamestart << " | " << std::setw(4) << linenumber << " | " << std::setw(12) << subsystem << " | "; // mStream << std::setw(8) << ICETimeHelper::timestamp() << " | " << std::setw(8) << ThreadInfo::currentThread() << " | " << std::setw(30) << filenamestart << " | " << std::setw(4) << linenumber << " | " << std::setw(12) << subsystem << " | ";
} }
void void
@ -202,7 +202,14 @@ Logger::endLine()
mStream->flush(); mStream->flush();
std::ostringstream result; std::ostringstream result;
result << std::setw(8) << ICETimeHelper::timestamp() << " | " << std::setw(8) << ThreadInfo::currentThread() << " | " << std::setw(30) << mFilename.c_str() << " | " << std::setw(4) << mLine << " | " << std::setw(12) << mSubsystem.c_str() << " | " << mStream->str().c_str(); std::chrono::milliseconds unix_timestamp_ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
time_t unix_timestamp = unix_timestamp_ms.count() / 1000;
struct tm current_time = *gmtime(&unix_timestamp);
char time_buffer[128]; strftime(time_buffer, sizeof(time_buffer), "%H:%M:%S", &current_time);
result << time_buffer << ":" << (unix_timestamp_ms.count() % 1000 ) << "\t" << " | " << std::setw(8) << ThreadInfo::currentThread() << " | " << std::setw(30)
<< mFilename.c_str() << " | " << std::setw(4) << mLine << " | " << std::setw(12) << mSubsystem.c_str() << " | "
<< mStream->str().c_str();
std::string t = result.str(); std::string t = result.str();
if (mUseDebugWindow) if (mUseDebugWindow)

2
src/libs/resiprocate/rutil/ssl/OpenSSLInit.cxx
View File

@ -72,7 +72,7 @@ OpenSSLInit::OpenSSLInit()
OpenSSLInit::~OpenSSLInit() OpenSSLInit::~OpenSSLInit()
{ {
mInitialized = false; mInitialized = false;
ERR_free_strings();// Clean up data allocated during SSL_load_error_strings ERR_free_strings();// Clean up data allocated during SSL_load_error_strings
ERR_remove_state(0);// free thread error queue ERR_remove_state(0);// free thread error queue
CRYPTO_cleanup_all_ex_data(); CRYPTO_cleanup_all_ex_data();