tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

some work in the new api:

Browse Source 
- log_level and save_each_line moved from Log to FileLog
- other fixes in loggers
- DirContainer from Dirs and LoadAvg had no dependencies set




git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1148 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-11-21 22:53:24 +00:00
parent 89d303f375
commit 491dd27ebf
18 changed files with 116 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
winixd/core/log.cpp
View File

@@ -46,14 +46,12 @@ namespace Winix
Log::Log()
{
log_level = 1;
current_level = 100; // nothing to log (call Init() first)
request = 0;
max_requests = 1;
lines = 0;
max_lines = 5000;
file_log = nullptr;
save_each_line = false;
buffer = nullptr;
}
@@ -89,17 +87,9 @@ void Log::SetDependency(Log * log)
}
int Log::LogLevel()
void Log::Init(int max_requests)
{
return log_level;
}
void Log::Init(int log_level, bool save_each_line, int max_requests)
{
this->log_level = log_level;
this->save_each_line = save_each_line;
this->max_requests = max_requests;
}
@@ -121,7 +111,7 @@ void Log::PrintDate(const PT::Date & date)
Log & Log::operator<<(const void * s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -133,7 +123,7 @@ Log & Log::operator<<(const void * s)
Log & Log::operator<<(const char * s)
{
if( current_level <= log_level && buffer && s )
if( current_level <= file_log->get_log_level() && buffer && s )
{
(*buffer) << s;
}
@@ -145,7 +135,7 @@ return *this;
Log & Log::operator<<(const std::string & s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -157,7 +147,7 @@ Log & Log::operator<<(const std::string & s)
Log & Log::operator<<(const std::string * s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << *s;
}
@@ -172,7 +162,7 @@ Log & Log::operator<<(const std::string * s)
Log & Log::operator<<(const wchar_t * s)
{
if( current_level <= log_level && buffer && s )
if( current_level <= file_log->get_log_level() && buffer && s )
{
(*buffer) << s;
}
@@ -184,7 +174,7 @@ return *this;
Log & Log::operator<<(const std::wstring & s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -196,7 +186,7 @@ Log & Log::operator<<(const std::wstring & s)
Log & Log::operator<<(const std::wstring * s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << *s;
}
@@ -210,7 +200,7 @@ Log & Log::operator<<(const std::wstring * s)
Log & Log::operator<<(int s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -222,7 +212,7 @@ Log & Log::operator<<(int s)
Log & Log::operator<<(long s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -235,7 +225,7 @@ Log & Log::operator<<(long s)
Log & Log::operator<<(char s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -246,7 +236,7 @@ Log & Log::operator<<(char s)
Log & Log::operator<<(wchar_t s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -257,7 +247,7 @@ Log & Log::operator<<(wchar_t s)
Log & Log::operator<<(size_t s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -269,7 +259,7 @@ Log & Log::operator<<(size_t s)
Log & Log::operator<<(double s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -281,7 +271,7 @@ Log & Log::operator<<(double s)
Log & Log::operator<<(const PT::Space & s)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
@@ -293,7 +283,7 @@ return *this;
Log & Log::operator<<(const PT::Date & date)
{
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << date;
}
@@ -308,12 +298,12 @@ Log & Log::operator<<(LogManipulators m)
switch(m)
{
case logend:
if( current_level <= log_level && buffer )
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << '\n';
lines += 1;
if( save_each_line )
if( file_log->should_save_each_line() )
SaveLogAndClear();
}
break;
@@ -455,7 +445,7 @@ void Log::SaveLogAndClear()
void Log::SaveLog()
{
if( file_log && buffer )
if( buffer )
{
file_log->save_log(buffer);
}