StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2829'

Browse Source 
Fixes #2823
Closes #1615
This commit is contained in:
tux3 2016-01-21 02:37:10 +01:00
commit 24f5e728a1
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.cpp
View File

@ -32,6 +32,7 @@
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QDir>
#include <QFile> #include <QFile>
#include <QFontDatabase> #include <QFontDatabase>
#include <QMutexLocker> #include <QMutexLocker>
@ -127,8 +128,28 @@ int main(int argc, char *argv[])
sodium_init(); // For the auto-updater sodium_init(); // For the auto-updater
#ifdef LOG_TO_FILE #ifdef LOG_TO_FILE
QString logFileDir = Settings::getInstance().getSettingsDirPath();
logFileStream.reset(new QTextStream); logFileStream.reset(new QTextStream);
logFileFile.reset(new QFile(Settings::getInstance().getSettingsDirPath()+"qtox.log")); logFileFile.reset(new QFile(logFileDir + "qtox.log"));
// Trim log file if over 1MB
if (logFileFile->size() > 1000000) {
qDebug() << "Log file over 1MB, rotating...";
QDir dir (logFileDir);
// Check if log.1 already exists, and if so, delete it
if (dir.remove(logFileDir + "qtox.log.1"))
qDebug() << "Removed log successfully";
else
qDebug() << "Unable to remove old log file";
dir.rename(logFileDir + "qtox.log", logFileDir + "qtox.log.1");
// Return to original log file path
logFileFile->setFileName(logFileDir + "qtox.log");
}
if (logFileFile->open(QIODevice::Append)) if (logFileFile->open(QIODevice::Append))
{ {
logFileStream->setDevice(logFileFile.get()); logFileStream->setDevice(logFileFile.get());
@ -247,6 +268,6 @@ int main(int argc, char *argv[])
Nexus::destroyInstance(); Nexus::destroyInstance();
CameraSource::destroyInstance(); CameraSource::destroyInstance();
Settings::destroyInstance(); Settings::destroyInstance();
qDebug() << "Clean exit with status"<<errorcode; qDebug() << "Clean exit with status" << errorcode;
return errorcode; return errorcode;
} }