luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2026-01-12 12:15:26 +01:00
Code Activity

Make logging timestamps configurable (#16581)

Browse Source
This commit is contained in:
sfan5
2025-10-17 00:18:06 +02:00
committed by GitHub
parent 6b0e1e9b67
commit a049174f12
4 changed files with 89 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/log.cpp
View File

@@ -220,7 +220,7 @@ const char *Logger::getLevelLabel(LogLevel lev)
LogColor Logger::color_mode = LOG_COLOR_AUTO;
const std::string &Logger::getThreadName()
inline const std::string &Logger::getThreadName()
{
std::thread::id id = std::this_thread::get_id();
@@ -237,6 +237,22 @@ const std::string &Logger::getThreadName()
return fallback_name;
}
LogTimestamp Logger::timestamp_mode = LOG_TIMESTAMP_WALL;
inline std::string Logger::getLogTimestamp()
{
const static u64 begin_of_time = porting::getTimeMs();
if (timestamp_mode == LOG_TIMESTAMP_NONE)
return std::string();
if (timestamp_mode == LOG_TIMESTAMP_WALL)
return getTimestamp();
// LOG_TIMESTAMP_RELATIVE
float rel = (porting::getTimeMs() - begin_of_time) / 1000.0f;
char s[24];
snprintf(s, sizeof(s), "[% 8.2f]", rel);
return s;
}
void Logger::log(LogLevel lev, std::string_view text)
{
if (isLevelSilenced(lev))
@@ -244,10 +260,12 @@ void Logger::log(LogLevel lev, std::string_view text)
const std::string &thread_name = getThreadName();
const char *label = getLevelLabel(lev);
const std::string timestamp = getTimestamp();
const std::string timestamp = getLogTimestamp();
std::string line = timestamp;
line.append(": ").append(label).append("[").append(thread_name)
if (!line.empty())
line.append(": ");
line.append(label).append("[").append(thread_name)
.append("]: ").append(text);
logToOutputs(lev, line, timestamp, thread_name, text);