|
@@ -3,7 +3,7 @@
|
|
* Company: Lynar Studios
|
|
* Company: Lynar Studios
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
* Created: 2020-08-20
|
|
* Created: 2020-08-20
|
|
- * Changed: 2023-04-12
|
|
|
|
|
|
+ * Changed: 2023-05-17
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
|
|
|
|
@@ -28,6 +28,7 @@ using std::localtime;
|
|
using std::put_time;
|
|
using std::put_time;
|
|
using std::shared_ptr;
|
|
using std::shared_ptr;
|
|
using std::string;
|
|
using std::string;
|
|
|
|
+using std::string_view;
|
|
using std::stringstream;
|
|
using std::stringstream;
|
|
using std::time;
|
|
using std::time;
|
|
|
|
|
|
@@ -62,7 +63,7 @@ void Logger::fatal(const byte_type *_data)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-LogLevel Logger::getLogLevel()
|
|
|
|
|
|
+LogLevel Logger::getLogLevel() const
|
|
{
|
|
{
|
|
return this->logLevel;
|
|
return this->logLevel;
|
|
}
|
|
}
|
|
@@ -134,7 +135,7 @@ string Logger::_buildCharacterChain(size_t _amount)
|
|
return fillContent;
|
|
return fillContent;
|
|
}
|
|
}
|
|
|
|
|
|
-string Logger::_createFillContent(const string &_text)
|
|
|
|
|
|
+string Logger::_createFillContent(string_view _text)
|
|
{
|
|
{
|
|
size_t padSize = 10;
|
|
size_t padSize = 10;
|
|
size_t fillSize = _text.size() > padSize ? 0 : padSize - _text.size();
|
|
size_t fillSize = _text.size() > padSize ? 0 : padSize - _text.size();
|
|
@@ -148,7 +149,7 @@ string Logger::_createFillContent(const string &_text)
|
|
return fillContent;
|
|
return fillContent;
|
|
}
|
|
}
|
|
|
|
|
|
-string Logger::_generateTimeString(tm *_localTime)
|
|
|
|
|
|
+string Logger::_generateTimeString(const tm *_localTime)
|
|
{
|
|
{
|
|
stringstream _stream{};
|
|
stringstream _stream{};
|
|
_stream << put_time(_localTime, "%Y-%m-%d %H:%M:%S");
|
|
_stream << put_time(_localTime, "%Y-%m-%d %H:%M:%S");
|
|
@@ -171,18 +172,21 @@ string Logger::_getLogLevelString(const LogLevel &_logLevel) const
|
|
string Logger::_getTimestampString() const
|
|
string Logger::_getTimestampString() const
|
|
{
|
|
{
|
|
time_t timestamp = ::time(nullptr);
|
|
time_t timestamp = ::time(nullptr);
|
|
- tm *localTime = localtime(×tamp);
|
|
|
|
|
|
+ struct tm localTime
|
|
|
|
+ {
|
|
|
|
+ };
|
|
|
|
+ localtime_r(×tamp, &localTime);
|
|
string timestampString{};
|
|
string timestampString{};
|
|
|
|
|
|
if (this->displayTimestamp)
|
|
if (this->displayTimestamp)
|
|
{
|
|
{
|
|
- timestampString = "[" + Logger::_generateTimeString(localTime) + "] ";
|
|
|
|
|
|
+ timestampString = "[" + Logger::_generateTimeString(&localTime) + "] ";
|
|
}
|
|
}
|
|
|
|
|
|
return timestampString;
|
|
return timestampString;
|
|
}
|
|
}
|
|
|
|
|
|
-void Logger::_log(const byte_type *_data, const LogLevel &_logLevel)
|
|
|
|
|
|
+void Logger::_log(const byte_type *_data, const LogLevel &_logLevel) const
|
|
{
|
|
{
|
|
string logLevelString = this->_getLogLevelString(_logLevel);
|
|
string logLevelString = this->_getLogLevelString(_logLevel);
|
|
string timestampString = this->_getTimestampString();
|
|
string timestampString = this->_getTimestampString();
|