mirror of https://github.com/PurpleI2P/i2pd.git
Jeff Becker
9 years ago
15 changed files with 448 additions and 424 deletions
@ -1,133 +1,167 @@
@@ -1,133 +1,167 @@
|
||||
#include <boost/date_time/posix_time/posix_time.hpp> |
||||
#include "Log.h" |
||||
/*
|
||||
* Copyright (c) 2013-2016, The PurpleI2P Project |
||||
* |
||||
* This file is part of Purple i2pd project and licensed under BSD3 |
||||
* |
||||
* See full license text in LICENSE file at top of project tree |
||||
*/ |
||||
|
||||
Log * g_Log = nullptr; |
||||
#include "Log.h" |
||||
|
||||
namespace i2p { |
||||
namespace log { |
||||
Log logger; |
||||
/**
|
||||
* @enum Maps our loglevel to their symbolic name |
||||
*/ |
||||
static const char * g_LogLevelStr[eNumLogLevels] = |
||||
{ |
||||
"error", // eLogError
|
||||
"warn", // eLogWarning
|
||||
"warn", // eLogWarn
|
||||
"info", // eLogInfo
|
||||
"debug" // eLogDebug
|
||||
}; |
||||
#ifndef _WIN32 |
||||
/** convert LogLevel enum to syslog priority level */ |
||||
static int ToSyslogLevel(LogLevel lvl) |
||||
{ |
||||
switch (lvl) { |
||||
case eLogError: |
||||
return LOG_ERR; |
||||
case eLogWarning: |
||||
return LOG_WARNING; |
||||
case eLogInfo: |
||||
return LOG_INFO; |
||||
case eLogDebug: |
||||
return LOG_DEBUG; |
||||
default: |
||||
// WTF? invalid log level?
|
||||
return LOG_CRIT; |
||||
} |
||||
} |
||||
#endif |
||||
|
||||
void LogMsg::Process() |
||||
{ |
||||
#ifndef _WIN32 |
||||
if (log && log->SyslogEnabled()) { |
||||
// only log to syslog
|
||||
syslog(ToSyslogLevel(level), "%s", s.str().c_str()); |
||||
return; |
||||
/**
|
||||
* @brief Maps our log levels to syslog one |
||||
* @return syslog priority LOG_*, as defined in syslog.h |
||||
*/ |
||||
static inline int GetSyslogPrio (enum LogLevel l) { |
||||
int priority = LOG_DEBUG; |
||||
switch (l) { |
||||
case eLogError : priority = LOG_ERR; break; |
||||
case eLogWarning : priority = LOG_WARNING; break; |
||||
case eLogInfo : priority = LOG_INFO; break; |
||||
case eLogDebug : priority = LOG_DEBUG; break; |
||||
default : priority = LOG_DEBUG; break; |
||||
} |
||||
return priority; |
||||
} |
||||
#endif |
||||
auto stream = log ? log->GetLogStream () : nullptr; |
||||
auto& output = stream ? *stream : std::cout; |
||||
if (log) |
||||
output << log->GetTimestamp (); |
||||
else |
||||
output << boost::posix_time::second_clock::local_time().time_of_day (); |
||||
output << "/" << g_LogLevelStr[level] << " - "; |
||||
output << s.str(); |
||||
} |
||||
|
||||
const std::string& Log::GetTimestamp () |
||||
{ |
||||
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) && !defined(__clang__) |
||||
auto ts = std::chrono::monotonic_clock::now (); |
||||
#else |
||||
auto ts = std::chrono::steady_clock::now (); |
||||
#endif |
||||
if (ts > m_LastTimestampUpdate + std::chrono::milliseconds (500)) // 0.5 second
|
||||
Log::Log(): |
||||
m_Destination(eLogStdout), m_MinLevel(eLogInfo), |
||||
m_LogStream (nullptr), m_Logfile(""), m_IsReady(false) |
||||
{ |
||||
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 () |
||||
Log::~Log () |
||||
{ |
||||
if (m_LogStream) |
||||
switch (m_Destination) { |
||||
#ifndef _WIN32 |
||||
case eLogSyslog : |
||||
closelog(); |
||||
break; |
||||
#endif |
||||
case eLogFile: |
||||
case eLogStream: |
||||
m_LogStream->flush(); |
||||
break; |
||||
default: |
||||
/* do nothing */ |
||||
break; |
||||
} |
||||
|
||||
void Log::SetLogFile (const std::string& fullFilePath, bool truncate) |
||||
{ |
||||
m_FullFilePath = fullFilePath; |
||||
auto mode = std::ofstream::out | std::ofstream::binary; |
||||
mode |= truncate ? std::ofstream::trunc : std::ofstream::app; |
||||
auto logFile = std::make_shared<std::ofstream> (fullFilePath, mode); |
||||
if (logFile->is_open ()) |
||||
{ |
||||
SetLogStream (logFile); |
||||
LogPrint(eLogInfo, "Log: will send messages to ", fullFilePath); |
||||
} |
||||
} |
||||
|
||||
void Log::ReopenLogFile () |
||||
{ |
||||
if (m_FullFilePath.length () > 0) |
||||
{ |
||||
SetLogFile (m_FullFilePath, false); // don't truncate
|
||||
LogPrint(eLogInfo, "Log: file ", m_FullFilePath, " reopen"); |
||||
} |
||||
Process(); |
||||
} |
||||
|
||||
|
||||
void Log::SetLogLevel (const std::string& level) |
||||
{ |
||||
void Log::SetLogLevel (const std::string& level) { |
||||
if (level == "error") { m_MinLevel = eLogError; } |
||||
else if (level == "warn") { m_MinLevel = eLogWarning; } |
||||
else if (level == "info") { m_MinLevel = eLogInfo; } |
||||
else if (level == "debug") { m_MinLevel = eLogDebug; } |
||||
else { |
||||
LogPrint(eLogError, "Log: Unknown loglevel: ", level); |
||||
LogPrint(eLogError, "Log: unknown loglevel: ", level); |
||||
return; |
||||
} |
||||
LogPrint(eLogInfo, "Log: min msg level set to ", level); |
||||
LogPrint(eLogInfo, "Log: min messages level set to ", level); |
||||
} |
||||
|
||||
void Log::SetLogStream (std::shared_ptr<std::ostream> logStream) |
||||
{ |
||||
m_LogStream = logStream; |
||||
const char * Log::TimeAsString(std::time_t t) { |
||||
if (t != m_LastTimestamp) { |
||||
strftime(m_LastDateTime, sizeof(m_LastDateTime), "%H:%M:%S", localtime(&t)); |
||||
m_LastTimestamp = t; |
||||
} |
||||
return m_LastDateTime; |
||||
} |
||||
|
||||
void Log::StartSyslog(const std::string & ident, const int facility) |
||||
{ |
||||
/**
|
||||
* @note This function better to be run in separate thread due to disk i/o. |
||||
* Unfortunately, with current startup process with late fork() this |
||||
* will give us nothing but pain. Maybe later. See in NetDb as example. |
||||
*/ |
||||
void Log::Process() { |
||||
std::unique_lock<std::mutex> l(m_OutputLock); |
||||
std::hash<std::thread::id> hasher; |
||||
unsigned short short_tid; |
||||
while (1) { |
||||
auto msg = m_Queue.GetNextWithTimeout (1); |
||||
if (!msg) |
||||
break; |
||||
short_tid = (short) (hasher(msg->tid) % 1000); |
||||
switch (m_Destination) { |
||||
#ifndef _WIN32 |
||||
m_Ident = ident; |
||||
openlog(m_Ident.c_str(), LOG_PID, facility); |
||||
case eLogSyslog: |
||||
syslog(GetSyslogPrio(msg->level), "[%03u] %s", short_tid, msg->text.c_str()); |
||||
break; |
||||
#endif |
||||
case eLogFile: |
||||
case eLogStream: |
||||
*m_LogStream << TimeAsString(msg->timestamp) |
||||
<< "@" << short_tid |
||||
<< "/" << g_LogLevelStr[msg->level] |
||||
<< " - " << msg->text << std::endl; |
||||
break; |
||||
case eLogStdout: |
||||
default: |
||||
std::cout << TimeAsString(msg->timestamp) |
||||
<< "@" << short_tid |
||||
<< "/" << g_LogLevelStr[msg->level] |
||||
<< " - " << msg->text << std::endl; |
||||
break; |
||||
} // switch
|
||||
} // while
|
||||
} |
||||
|
||||
void Log::Append(std::shared_ptr<i2p::log::LogMsg> & msg) { |
||||
m_Queue.Put(msg); |
||||
if (!m_IsReady) |
||||
return; |
||||
Process(); |
||||
} |
||||
|
||||
void Log::SendTo (const std::string& path) { |
||||
auto flags = std::ofstream::out | std::ofstream::app; |
||||
auto os = std::make_shared<std::ofstream> (path, flags); |
||||
if (os->is_open ()) { |
||||
m_Logfile = path; |
||||
m_Destination = eLogFile; |
||||
m_LogStream = os; |
||||
return; |
||||
} |
||||
LogPrint(eLogError, "Log: can't open file ", path); |
||||
} |
||||
|
||||
void Log::SendTo (std::shared_ptr<std::ostream> os) { |
||||
m_Destination = eLogStream; |
||||
m_LogStream = os; |
||||
} |
||||
|
||||
void Log::StopSyslog() |
||||
{ |
||||
#ifndef _WIN32 |
||||
closelog(); |
||||
m_Ident.clear(); |
||||
void Log::SendTo(const char *name, int facility) { |
||||
m_Destination = eLogSyslog; |
||||
m_LogStream = nullptr; |
||||
openlog(name, LOG_CONS | LOG_PID, facility); |
||||
} |
||||
#endif |
||||
|
||||
void Log::Reopen() { |
||||
if (m_Destination == eLogFile) |
||||
SendTo(m_Logfile); |
||||
} |
||||
|
||||
bool Log::SyslogEnabled() |
||||
{ |
||||
return m_Ident.size() > 0; |
||||
Log & Logger() { |
||||
return logger; |
||||
} |
||||
} // log
|
||||
} // i2p
|
||||
|
||||
@ -1,4 +1,4 @@
@@ -1,4 +1,4 @@
|
||||
etc/i2pd/i2pd.conf var/lib/i2pd/i2p.conf |
||||
etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.cfg |
||||
etc/i2pd/i2pd.conf var/lib/i2pd/i2pd.conf |
||||
etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.conf |
||||
etc/i2pd/subscriptions.txt var/lib/i2pd/subscriptions.txt |
||||
usr/share/i2pd/certificates var/lib/i2pd/certificates |
||||
|
||||
Loading…
Reference in new issue