Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 10:43:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable color by default on Unix, change to comma separators.

Browse source 
Also emit a message if an unrecognized log option is used.
This commit is contained in:
Dale Glass 2020-10-16 20:16:44 +02:00
parent 895d4d4172
commit 1124590422
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libraries/shared/src/LogHandler.cpp
View file

@ -17,6 +17,10 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef Q_OS_UNIX
#include <stdio.h>
#include <unistd.h>
#endif
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QDateTime> #include <QtCore/QDateTime>
@ -33,22 +37,36 @@ LogHandler& LogHandler::getInstance() {
} }
LogHandler::LogHandler() { LogHandler::LogHandler() {
QString log_options = qgetenv("VIRCADIA_LOG_OPTIONS").toLower(); QString logOptions = qgetenv("VIRCADIA_LOG_OPTIONS").toLower();
if (log_options.contains("color")) { #ifdef Q_OS_UNIX
_useColor = 1; // Enable color by default if we're on Unix, and output is a tty (so we're not being piped into something)
//
// On Windows the situation is more complex, and color is supported or not depending on version and
// registry settings, so for now it's off by default and it's up to the user to do what's required.
if (isatty(fileno(stdout))) {
_useColor = true;
} }
#endif
if (log_options.contains("process_id")) { auto optionList = logOptions.split(",");
_shouldOutputProcessID = true;
}
if (log_options.contains("thread_id")) { for(auto option : optionList) {
_shouldOutputThreadID = true; option = option.trimmed();
}
if (log_options.contains("milliseconds")) { if (option == "color") {
_shouldDisplayMilliseconds = true; _useColor = true;
} else if (option == "nocolor") {
_useColor = false;
} else if (option == "process_id") {
_shouldOutputProcessID = true;
} else if (option == "thread_id") {
_shouldOutputThreadID = true;
} else if (option == "milliseconds") {
_shouldDisplayMilliseconds = true;
} else if (option != "") {
fprintf(stdout, "Unrecognized option in VIRCADIA_LOG_OPTIONS: '%s'\n", option.toUtf8().constData());
}
} }
} }