Commit 4b38187d authored by Fabio Bas's avatar Fabio Bas
Browse files

Fix logfile option in servatrice.ini

servatrice was using hardcocded filename “server.log” even if a custom
value was specified
parent 8b32e51c
...@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) ...@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
logger->moveToThread(loggerThread); logger->moveToThread(loggerThread);
loggerThread->start(); loggerThread->start();
QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settingsCache->value("server/logfile").toString())); QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settingsCache->value("server/logfile", QString("server.log")).toString()));
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
if (logToConsole) if (logToConsole)
......
...@@ -26,7 +26,7 @@ ServerLogger::~ServerLogger() ...@@ -26,7 +26,7 @@ ServerLogger::~ServerLogger()
void ServerLogger::startLog(const QString &logFileName) void ServerLogger::startLog(const QString &logFileName)
{ {
if (!logFileName.isEmpty()) { if (!logFileName.isEmpty()) {
logFile = new QFile("server.log", this); logFile = new QFile(logFileName, this);
logFile->open(QIODevice::Append); logFile->open(QIODevice::Append);
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
::socketpair(AF_UNIX, SOCK_STREAM, 0, sigHupFD); ::socketpair(AF_UNIX, SOCK_STREAM, 0, sigHupFD);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment