jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add install mode to logger; fix #3558 (#3563)

Browse source 
## Related Ticket(s)
- Fixes #3558

![schermata 2019-02-06 alle 08 45 25](https://user-images.githubusercontent.com/1631111/52327211-98419900-29eb-11e9-9d15-69f59fc9d379.png)
This commit is contained in:
ctrlaltca 2019-02-06 12:27:32 +01:00 • committed by tooomm
parent 46b34d6515
commit 6e3fd30fcb
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/logger.cpp
View file

@ -1,5 +1,7 @@
#include "logger.h"
#include "version_string.h"
#include <QApplication>
#include <QDateTime>
#include <QLocale>
#include <QSysInfo>
@ -13,9 +15,12 @@ Logger::Logger() : logToFileEnabled(false)
logBuffer.append(getClientVersion());
logBuffer.append(getSystemArchitecture());
logBuffer.append(getSystemLocale());
logBuffer.append(getClientInstallInfo());
logBuffer.append(QString("-").repeated(75));
std::cerr << getClientVersion().toStdString() << std::endl;
std::cerr << getSystemArchitecture().toStdString() << std::endl;
std::cerr << getSystemLocale().toStdString() << std::endl;
std::cerr << getClientInstallInfo().toStdString() << std::endl;
}
Logger::~Logger()
@ -50,6 +55,7 @@ void Logger::openLogfileSession()
fileStream << "Log session started at " << QDateTime::currentDateTime().toString() << endl;
fileStream << getClientVersion() << endl;
fileStream << getSystemArchitecture() << endl;
fileStream << getClientInstallInfo() << endl;
logToFileEnabled = true;
}
@ -68,7 +74,7 @@ void Logger::log(QtMsgType /* type */, const QMessageLogContext & /* ctx */, con
QMetaObject::invokeMethod(this, "internalLog", Qt::QueuedConnection, Q_ARG(const QString &, message));
}
void Logger::internalLog(const QString message)
void Logger::internalLog(QString message)
{
QMutexLocker locker(&mutex);
@ -106,7 +112,14 @@ QString Logger::getClientOperatingSystem()
QString Logger::getSystemLocale()
{
QString result;
result.append(QString("System Locale: ") + QLocale().name());
QString result(QString("System Locale: ") + QLocale().name());
return result;
}
QString Logger::getClientInstallInfo()
{
// don't rely on settingsCache->getIsPortableBuild() since the logger is initialized earlier
bool isPortable = QFile::exists(qApp->applicationDirPath() + "/portable.dat");
QString result(QString("Install Mode: ") + (isPortable ? "Portable" : "Standard"));
return result;
}