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

updated to the new pikotools api - we have a logger for morm and ezc

Browse Source 
pikotools has now Log and FileLog classes
which are base classes for winix Log and FileLog classes




git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1151 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-11-23 17:53:43 +00:00
parent 491dd27ebf
commit b90445de4a
35 changed files with 1163 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

314
winixd/core/log.cpp
View File

@@ -46,39 +46,16 @@ namespace Winix
Log::Log()
{
current_level = 100; // nothing to log (call Init() first)
request = 0;
max_requests = 1;
lines = 0;
max_lines = 5000;
file_log = nullptr;
buffer = nullptr;
}
Log::~Log()
{
SaveLogAndClear();
}
void Log::SetLogBuffer(TextStream<std::wstring> * buffer)
{
this->buffer = buffer;
}
void Log::SetFileLog(FileLog * pfile_log)
{
this->file_log = pfile_log;
}
FileLog * Log::GetFileLog()
{
return file_log;
}
void Log::SetDependency(Log * log)
{
@@ -88,34 +65,28 @@ void Log::SetDependency(Log * log)
void Log::Init(int max_requests)
void Log::SetMaxRequests(int max_requests)
{
this->max_requests = max_requests;
this->max_requests = max_requests;
}
void Log::PrintDate(const PT::Date & date)
{
if( file_log )
{
(*this) << file_log->get_local_date(date);
}
FileLog * winix_file_log = dynamic_cast<FileLog*>(file_log);
if( winix_file_log )
(*this) << winix_file_log->get_local_date(date);
else
{
(*this) << date;
}
}
Log & Log::operator<<(const void * s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -123,23 +94,15 @@ Log & Log::operator<<(const void * s)
Log & Log::operator<<(const char * s)
{
if( current_level <= file_log->get_log_level() && buffer && s )
{
(*buffer) << s;
}
return *this;
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(const std::string & s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -147,11 +110,7 @@ Log & Log::operator<<(const std::string & s)
Log & Log::operator<<(const std::string * s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << *s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -162,23 +121,15 @@ Log & Log::operator<<(const std::string * s)
Log & Log::operator<<(const wchar_t * s)
{
if( current_level <= file_log->get_log_level() && buffer && s )
{
(*buffer) << s;
}
return *this;
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(const std::wstring & s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -186,25 +137,15 @@ Log & Log::operator<<(const std::wstring & s)
Log & Log::operator<<(const std::wstring * s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << *s;
}
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(int s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -212,11 +153,7 @@ Log & Log::operator<<(int s)
Log & Log::operator<<(long s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -225,33 +162,21 @@ Log & Log::operator<<(long s)
Log & Log::operator<<(char s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(wchar_t s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(size_t s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -259,11 +184,7 @@ Log & Log::operator<<(size_t s)
Log & Log::operator<<(double s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
PT::Log::operator<<(s);
return *this;
}
@@ -271,24 +192,16 @@ Log & Log::operator<<(double s)
Log & Log::operator<<(const PT::Space & s)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << s;
}
return *this;
PT::Log::operator<<(s);
return *this;
}
Log & Log::operator<<(const PT::Date & date)
{
if( current_level <= file_log->get_log_level() && buffer )
{
(*buffer) << date;
}
return *this;
PT::Log::operator<<(date);
return *this;
}
@@ -297,42 +210,38 @@ Log & Log::operator<<(LogManipulators m)
{
switch(m)
{
case logend:
if( current_level <= file_log->get_log_level() && buffer )
case LogManipulators::log1:
PT::Log::operator<<(PT::Log::log1);
break;
case LogManipulators::log2:
PT::Log::operator<<(PT::Log::log2);
break;
case LogManipulators::log3:
PT::Log::operator<<(PT::Log::log3);
break;
case LogManipulators::log4:
PT::Log::operator<<(PT::Log::log4);
break;
case LogManipulators::logend:
PT::Log::operator<<(PT::Log::logend);
break;
case LogManipulators::logsave:
PT::Log::operator<<(PT::Log::logsave);
break;
case LogManipulators::logendrequest:
if( ++request >= max_requests )
{
(*buffer) << '\n';
lines += 1;
if( file_log->should_save_each_line() )
SaveLogAndClear();
save_log_and_clear();
request = 0;
}
break;
case logsave:
SaveLogAndClear();
break;
case logendrequest:
if( ++request >= max_requests || lines > max_lines )
SaveLogAndClear();
break;
case log1:
current_level = 1;
break;
case log2:
current_level = 2;
break;
case log3:
current_level = 3;
break;
case log4:
current_level = 4;
break;
default:
break;
}
@@ -341,84 +250,7 @@ return *this;
}
char Log::GetHEXdigit(unsigned char c)
{
if( c < 10 )
return c + '0';
return c - 10 + 'A';
}
void Log::ToHEX(char * buf, unsigned char c)
{
buf[0] = GetHEXdigit(c >> 4);
buf[1] = GetHEXdigit(c & 0xf);
buf[2] = 0;
}
void Log::LogBinary(const char * blob, size_t blob_len)
{
size_t i=0;
char buf[3];
if( !buffer )
return;
while( i < blob_len )
{
size_t oldi = i;
for(size_t a=0 ; a<16 ; ++a)
{
if( i < blob_len )
{
ToHEX(buf, blob[i]);
(*buffer) << buf << ' ';
++i;
}
else
{
(*buffer) << " ";
}
if( a == 7 )
{
if( i < blob_len )
(*buffer) << "- ";
else
(*buffer) << " ";
}
}
i = oldi;
(*buffer) << ' ';
for(size_t a=0 ; a<16 && i<blob_len ; ++a, ++i)
{
if( blob[i] > 31 && blob[i] < 127 )
(*buffer) << blob[i];
else
(*buffer) << '.';
}
(*this) << logend;
}
}
void Log::LogBinary(const std::string & blob)
{
LogBinary(blob.c_str(), blob.size());
}
void Log::SystemErr(int err)
Log & Log::SystemErr(int err)
{
(*this) << "errno: " << err;
@@ -426,29 +258,37 @@ void Log::SystemErr(int err)
if( err_msg )
(*this) << " (" << err_msg << ")";
return *this;
}
void Log::SaveLogAndClear()
Log & Log::LogString(const std::string & value, size_t max_size)
{
SaveLog();
if( buffer )
{
buffer->Clear();
}
request = 0;
lines = 0;
PT::Log::LogString(value, max_size);
return *this;
}
void Log::SaveLog()
Log & Log::LogString(const std::wstring & value, size_t max_size)
{
if( buffer )
{
file_log->save_log(buffer);
}
PT::Log::LogString(value, max_size);
return *this;
}
Log & Log::LogBinary(const char * blob, size_t blob_len)
{
PT::Log::LogBinary(blob, blob_len);
return *this;
}
Log & Log::LogBinary(const std::string & blob)
{
PT::Log::LogBinary(blob);
return *this;
}