PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-12 11:21:04 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'github/master'

Browse Source 
Conflicts:
	Log.cpp
	Log.h
This commit is contained in:
EinMByte 2015-07-21 11:31:36 +02:00
commit 6f569f5334
2 changed files with 101 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Log.cpp
View File

@ -5,36 +5,40 @@ Log * g_Log = nullptr;
static const char * g_LogLevelStr[eNumLogLevels] = static const char * g_LogLevelStr[eNumLogLevels] =
{ {
"error", // eLogError "error", // eLogError
"warn", // eLogWarning "warn", // eLogWarning
"info", // eLogInfo "info", // eLogInfo
"debug" // eLogDebug "debug" // eLogDebug
}; };
void LogMsg::Process() void LogMsg::Process()
{ {
auto& output = (log && log->GetLogStream ()) ? *log->GetLogStream () : std::cerr; auto& output = (log && log->GetLogStream ()) ? *log->GetLogStream () : std::cerr;
if (log) if (log)
output << log->GetTimestamp (); output << log->GetTimestamp ();
else else
output << boost::posix_time::second_clock::local_time().time_of_day (); output << boost::posix_time::second_clock::local_time().time_of_day ();
output << "/" << g_LogLevelStr[level] << " - "; output << "/" << g_LogLevelStr[level] << " - ";
output << s.str(); output << s.str();
} }
const std::string& Log::GetTimestamp () const std::string& Log::GetTimestamp ()
{ {
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) #if !defined(__APPLE__)
auto ts = std::chrono::monotonic_clock::now (); #if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) && !defined(__APPLE__)
#else auto ts = std::chrono::monotonic_clock::now ();
auto ts = std::chrono::steady_clock::now (); #else
#endif auto ts = std::chrono::steady_clock::now ();
if (ts > m_LastTimestampUpdate + std::chrono::milliseconds (500)) // 0.5 second #endif
{ #else
m_LastTimestampUpdate = ts; auto ts = std::chrono::steady_clock::now ();
m_Timestamp = boost::posix_time::to_simple_string (boost::posix_time::second_clock::local_time().time_of_day ()); #endif
} if (ts > m_LastTimestampUpdate + std::chrono::milliseconds (500)) // 0.5 second
return m_Timestamp; {
m_LastTimestampUpdate = ts;
m_Timestamp = boost::posix_time::to_simple_string (boost::posix_time::second_clock::local_time().time_of_day ());
}
return m_Timestamp;
} }
void Log::Flush () void Log::Flush ()
@ -45,18 +49,18 @@ void Log::Flush ()
void Log::SetLogFile (const std::string& fullFilePath) void Log::SetLogFile (const std::string& fullFilePath)
{ {
auto logFile = new std::ofstream (fullFilePath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc); auto logFile = new std::ofstream (fullFilePath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc);
if (logFile->is_open ()) if (logFile->is_open ())
{ {
SetLogStream (logFile); SetLogStream (logFile);
LogPrint("Logging to file ", fullFilePath, " enabled."); LogPrint("Logging to file ", fullFilePath, " enabled.");
} }
else else
delete logFile; delete logFile;
} }
void Log::SetLogStream (std::ostream * logStream) void Log::SetLogStream (std::ostream * logStream)
{ {
if (m_LogStream) delete m_LogStream; if (m_LogStream) delete m_LogStream;
m_LogStream = logStream; m_LogStream = logStream;
} }

126
Log.h
View File

@ -11,23 +11,23 @@
enum LogLevel enum LogLevel
{ {
eLogError = 0, eLogError = 0,
eLogWarning, eLogWarning,
eLogInfo, eLogInfo,
eLogDebug, eLogDebug,
eNumLogLevels eNumLogLevels
}; };
class Log; class Log;
struct LogMsg struct LogMsg
{ {
std::stringstream s; std::stringstream s;
Log * log; Log * log;
LogLevel level; LogLevel level;
LogMsg (Log * l = nullptr, LogLevel lv = eLogInfo): log (l), level (lv) {}; LogMsg (Log * l = nullptr, LogLevel lv = eLogInfo): log (l), level (lv) {};
void Process(); void Process();
}; };
class Log: public i2p::util::MsgQueue<LogMsg> class Log: public i2p::util::MsgQueue<LogMsg>
@ -37,93 +37,97 @@ class Log: public i2p::util::MsgQueue<LogMsg>
Log (): m_LogStream (nullptr) { SetOnEmpty (std::bind (&Log::Flush, this)); }; Log (): m_LogStream (nullptr) { SetOnEmpty (std::bind (&Log::Flush, this)); };
~Log () { delete m_LogStream; }; ~Log () { delete m_LogStream; };
void SetLogFile (const std::string& fullFilePath); void SetLogFile (const std::string& fullFilePath);
void SetLogStream (std::ostream * logStream); void SetLogStream (std::ostream * logStream);
std::ostream * GetLogStream () const { return m_LogStream; }; std::ostream * GetLogStream () const { return m_LogStream; };
const std::string& GetTimestamp (); const std::string& GetTimestamp ();
private: private:
void Flush (); void Flush ();
private: private:
std::ostream * m_LogStream; std::ostream * m_LogStream;
std::string m_Timestamp; std::string m_Timestamp;
#if !defined(__APPLE__)
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) // gcc 4.6 #if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) // gcc 4.6
std::chrono::monotonic_clock::time_point m_LastTimestampUpdate; std::chrono::monotonic_clock::time_point m_LastTimestampUpdate;
#else #else
std::chrono::steady_clock::time_point m_LastTimestampUpdate; std::chrono::steady_clock::time_point m_LastTimestampUpdate;
#endif #endif
#else
std::chrono::steady_clock::time_point m_LastTimestampUpdate;
#endif
}; };
extern Log * g_Log; extern Log * g_Log;
inline void StartLog (const std::string& fullFilePath) inline void StartLog (const std::string& fullFilePath)
{ {
if (!g_Log) if (!g_Log)
{ {
auto log = new Log (); auto log = new Log ();
if (fullFilePath.length () > 0) if (fullFilePath.length () > 0)
log->SetLogFile (fullFilePath); log->SetLogFile (fullFilePath);
g_Log = log; g_Log = log;
} }
} }
inline void StartLog (std::ostream * s) inline void StartLog (std::ostream * s)
{ {
if (!g_Log) if (!g_Log)
{ {
auto log = new Log (); auto log = new Log ();
if (s) if (s)
log->SetLogStream (s); log->SetLogStream (s);
g_Log = log; g_Log = log;
} }
} }
inline void StopLog () inline void StopLog ()
{ {
if (g_Log) if (g_Log)
{ {
auto log = g_Log; auto log = g_Log;
g_Log = nullptr; g_Log = nullptr;
log->Stop (); log->Stop ();
delete log; delete log;
} }
} }
template<typename TValue> template<typename TValue>
void LogPrint (std::stringstream& s, TValue arg) void LogPrint (std::stringstream& s, TValue arg)
{ {
s << arg; s << arg;
} }
template<typename TValue, typename... TArgs> template<typename TValue, typename... TArgs>
void LogPrint (std::stringstream& s, TValue arg, TArgs... args) void LogPrint (std::stringstream& s, TValue arg, TArgs... args)
{ {
LogPrint (s, arg); LogPrint (s, arg);
LogPrint (s, args...); LogPrint (s, args...);
} }
template<typename... TArgs> template<typename... TArgs>
void LogPrint (LogLevel level, TArgs... args) void LogPrint (LogLevel level, TArgs... args)
{ {
LogMsg * msg = new LogMsg (g_Log, level); LogMsg * msg = new LogMsg (g_Log, level);
LogPrint (msg->s, args...); LogPrint (msg->s, args...);
msg->s << std::endl; msg->s << std::endl;
if (g_Log) if (g_Log)
g_Log->Put (msg); g_Log->Put (msg);
else else
{ {
msg->Process (); msg->Process ();
delete msg; delete msg;
} }
} }
template<typename... TArgs> template<typename... TArgs>
void LogPrint (TArgs... args) void LogPrint (TArgs... args)
{ {
LogPrint (eLogInfo, args...); LogPrint (eLogInfo, args...);
} }
#endif #endif