From d2096b17e65e7c2578406e8bcad60d435f1c5c3b Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Tue, 15 Sep 2020 12:43:31 +0300 Subject: [PATCH] - minor cleanup - log time instead of timestamp --- src/libs/ice/ICELog.cpp | 11 +++++++++-- src/libs/resiprocate/rutil/ssl/OpenSSLInit.cxx | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libs/ice/ICELog.cpp b/src/libs/ice/ICELog.cpp index bd2d3651..4dc61ce8 100644 --- a/src/libs/ice/ICELog.cpp +++ b/src/libs/ice/ICELog.cpp @@ -191,7 +191,7 @@ void Logger::beginLine(LogLevel level, const char* filename, int linenumber, con mLine = linenumber; 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 @@ -202,7 +202,14 @@ Logger::endLine() mStream->flush(); 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::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", ¤t_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(); if (mUseDebugWindow) diff --git a/src/libs/resiprocate/rutil/ssl/OpenSSLInit.cxx b/src/libs/resiprocate/rutil/ssl/OpenSSLInit.cxx index 9b3e9e39..2047a640 100644 --- a/src/libs/resiprocate/rutil/ssl/OpenSSLInit.cxx +++ b/src/libs/resiprocate/rutil/ssl/OpenSSLInit.cxx @@ -72,7 +72,7 @@ OpenSSLInit::OpenSSLInit() OpenSSLInit::~OpenSSLInit() { - mInitialized = false; + mInitialized = false; ERR_free_strings();// Clean up data allocated during SSL_load_error_strings ERR_remove_state(0);// free thread error queue CRYPTO_cleanup_all_ex_data();