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

Merge pull request #13018 from huffman/fix/logging-size-limit

Browse source 
Fix old log files not being cleaned up
This commit is contained in:
Stephen Birarda 2018-05-04 10:46:13 -07:00 committed by GitHub
commit a922471b9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libraries/shared/src/shared/FileLogger.cpp
View file

@ -36,17 +36,14 @@ protected:
private: private:
const FileLogger& _logger; const FileLogger& _logger;
QMutex _fileMutex; QMutex _fileMutex;
uint64_t _lastRollTime;
}; };
static const QString FILENAME_FORMAT = "hifi-log_%1%2.txt"; static const QString FILENAME_FORMAT = "hifi-log_%1%2.txt";
static const QString DATETIME_FORMAT = "yyyy-MM-dd_hh.mm.ss"; static const QString DATETIME_FORMAT = "yyyy-MM-dd_hh.mm.ss";
static const QString LOGS_DIRECTORY = "Logs"; static const QString LOGS_DIRECTORY = "Logs";
static const QString IPADDR_WILDCARD = "[0-9]*.[0-9]*.[0-9]*.[0-9]*"; static const QString DATETIME_WILDCARD = "20[0-9][0-9]-[01][0-9]-[0-3][0-9]_[0-2][0-9]\\.[0-6][0-9]\\.[0-6][0-9]";
static const QString DATETIME_WILDCARD = "20[0-9][0-9]-[0,1][0-9]-[0-3][0-9]_[0-2][0-9].[0-6][0-9].[0-6][0-9]"; static const QString SESSION_WILDCARD = "[0-9a-z]{8}(-[0-9a-z]{4}){3}-[0-9a-z]{12}";
static const QString FILENAME_WILDCARD = "hifi-log_" + IPADDR_WILDCARD + "_" + DATETIME_WILDCARD + ".txt"; static QRegExp LOG_FILENAME_REGEX { "hifi-log_" + DATETIME_WILDCARD + "(_" + SESSION_WILDCARD + ")?\\.txt" };
static QUuid SESSION_ID; static QUuid SESSION_ID;
// Max log size is 512 KB. We send log files to our crash reporter, so we want to keep this relatively // Max log size is 512 KB. We send log files to our crash reporter, so we want to keep this relatively
@ -54,8 +51,6 @@ static QUuid SESSION_ID;
static const qint64 MAX_LOG_SIZE = 512 * 1024; static const qint64 MAX_LOG_SIZE = 512 * 1024;
// Max log files found in the log directory is 100. // Max log files found in the log directory is 100.
static const qint64 MAX_LOG_DIR_SIZE = 512 * 1024 * 100; static const qint64 MAX_LOG_DIR_SIZE = 512 * 1024 * 100;
// Max log age is 1 hour
static const uint64_t MAX_LOG_AGE_USECS = USECS_PER_SECOND * 3600;
static FilePersistThread* _persistThreadInstance; static FilePersistThread* _persistThreadInstance;
@ -86,38 +81,34 @@ FilePersistThread::FilePersistThread(const FileLogger& logger) : _logger(logger)
if (file.exists()) { if (file.exists()) {
rollFileIfNecessary(file, false); rollFileIfNecessary(file, false);
} }
_lastRollTime = usecTimestampNow();
} }
void FilePersistThread::rollFileIfNecessary(QFile& file, bool notifyListenersIfRolled) { void FilePersistThread::rollFileIfNecessary(QFile& file, bool notifyListenersIfRolled) {
uint64_t now = usecTimestampNow(); if (file.size() > MAX_LOG_SIZE) {
if ((file.size() > MAX_LOG_SIZE) || (now - _lastRollTime) > MAX_LOG_AGE_USECS) {
QString newFileName = getLogRollerFilename(); QString newFileName = getLogRollerFilename();
if (file.copy(newFileName)) { if (file.copy(newFileName)) {
file.open(QIODevice::WriteOnly | QIODevice::Truncate); file.open(QIODevice::WriteOnly | QIODevice::Truncate);
file.close(); file.close();
qCDebug(shared) << "Rolled log file:" << newFileName;
if (notifyListenersIfRolled) { if (notifyListenersIfRolled) {
emit rollingLogFile(newFileName); emit rollingLogFile(newFileName);
} }
_lastRollTime = now;
} }
QStringList nameFilters;
nameFilters << FILENAME_WILDCARD;
QDir logQDir(FileUtils::standardPath(LOGS_DIRECTORY)); QDir logDir(FileUtils::standardPath(LOGS_DIRECTORY));
logQDir.setNameFilters(nameFilters); logDir.setSorting(QDir::Time);
logQDir.setSorting(QDir::Time); logDir.setFilter(QDir::Files);
QFileInfoList filesInDir = logQDir.entryInfoList();
qint64 totalSizeOfDir = 0; qint64 totalSizeOfDir = 0;
foreach(QFileInfo dirItm, filesInDir){ QFileInfoList filesInDir = logDir.entryInfoList();
if (totalSizeOfDir < MAX_LOG_DIR_SIZE){ for (auto& fileInfo : filesInDir) {
totalSizeOfDir += dirItm.size(); if (!LOG_FILENAME_REGEX.exactMatch(fileInfo.fileName())) {
} else { continue;
QFile file(dirItm.filePath()); }
file.remove(); totalSizeOfDir += fileInfo.size();
if (totalSizeOfDir > MAX_LOG_DIR_SIZE){
qDebug() << "Removing log file: " << fileInfo.fileName();
QFile oldLogFile(fileInfo.filePath());
oldLogFile.remove();
} }
} }
} }
@ -129,7 +120,7 @@ bool FilePersistThread::processQueueItems(const Queue& messages) {
rollFileIfNecessary(file); rollFileIfNecessary(file);
if (file.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { if (file.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) {
QTextStream out(&file); QTextStream out(&file);
foreach(const QString& message, messages) { for (const QString& message : messages) {
out << message; out << message;
} }
} }