|
|
|
|
@ -1,7 +1,7 @@
@@ -1,7 +1,7 @@
|
|
|
|
|
/**
|
|
|
|
|
@file |
|
|
|
|
@author Stefan Frings |
|
|
|
|
*/ |
|
|
|
|
@file |
|
|
|
|
@author Stefan Frings |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
#include "filelogger.h" |
|
|
|
|
#include <QTime> |
|
|
|
|
@ -32,11 +32,12 @@ void FileLogger::refreshSettings()
@@ -32,11 +32,12 @@ void FileLogger::refreshSettings()
|
|
|
|
|
void FileLogger::refreshQtSettings() |
|
|
|
|
{ |
|
|
|
|
// Save old file name for later comparision with new settings
|
|
|
|
|
QString oldFileName=fileName; |
|
|
|
|
QString oldFileName = fileName; |
|
|
|
|
|
|
|
|
|
// Load new config settings
|
|
|
|
|
settings->sync(); |
|
|
|
|
fileName=settings->value("fileName").toString(); |
|
|
|
|
fileName = settings->value("fileName").toString(); |
|
|
|
|
|
|
|
|
|
// Convert relative fileName to absolute, based on the directory of the config file.
|
|
|
|
|
#ifdef Q_OS_WIN32 |
|
|
|
|
if (QDir::isRelativePath(fileName) && settings->format()!=QSettings::NativeFormat) |
|
|
|
|
@ -45,19 +46,20 @@ void FileLogger::refreshQtSettings()
@@ -45,19 +46,20 @@ void FileLogger::refreshQtSettings()
|
|
|
|
|
#endif |
|
|
|
|
{ |
|
|
|
|
QFileInfo configFile(settings->fileName()); |
|
|
|
|
fileName=QFileInfo(configFile.absolutePath(),fileName).absoluteFilePath(); |
|
|
|
|
fileName = QFileInfo(configFile.absolutePath(), fileName).absoluteFilePath(); |
|
|
|
|
} |
|
|
|
|
maxSize=settings->value("maxSize",0).toLongLong(); |
|
|
|
|
maxBackups=settings->value("maxBackups",0).toInt(); |
|
|
|
|
msgFormat=settings->value("msgFormat","{timestamp} {type} {msg}").toString(); |
|
|
|
|
timestampFormat=settings->value("timestampFormat","yyyy-MM-dd hh:mm:ss.zzz").toString(); |
|
|
|
|
minLevel=static_cast<QtMsgType>(settings->value("minLevel",0).toInt()); |
|
|
|
|
bufferSize=settings->value("bufferSize",0).toInt(); |
|
|
|
|
|
|
|
|
|
maxSize = settings->value("maxSize", 0).toLongLong(); |
|
|
|
|
maxBackups = settings->value("maxBackups", 0).toInt(); |
|
|
|
|
msgFormat = settings->value("msgFormat", "{timestamp} {type} {msg}").toString(); |
|
|
|
|
timestampFormat = settings->value("timestampFormat", "yyyy-MM-dd hh:mm:ss.zzz").toString(); |
|
|
|
|
minLevel = static_cast<QtMsgType>(settings->value("minLevel", 0).toInt()); |
|
|
|
|
bufferSize = settings->value("bufferSize", 0).toInt(); |
|
|
|
|
|
|
|
|
|
// Create new file if the filename has been changed
|
|
|
|
|
if (oldFileName!=fileName) |
|
|
|
|
if (oldFileName != fileName) |
|
|
|
|
{ |
|
|
|
|
fprintf(stderr,"Logging to %s\n",qPrintable(fileName)); |
|
|
|
|
fprintf(stderr, "FileLogger::refreshQtSettings: Logging to %s\n", qPrintable(fileName)); |
|
|
|
|
close(); |
|
|
|
|
open(); |
|
|
|
|
} |
|
|
|
|
@ -66,15 +68,13 @@ void FileLogger::refreshQtSettings()
@@ -66,15 +68,13 @@ void FileLogger::refreshQtSettings()
|
|
|
|
|
void FileLogger::refreshFileLogSettings() |
|
|
|
|
{ |
|
|
|
|
// Save old file name for later comparision with new settings
|
|
|
|
|
QString oldFileName = fileLoggerSettings.fileName; |
|
|
|
|
QString oldFileName = fileName; |
|
|
|
|
|
|
|
|
|
// Load new config settings
|
|
|
|
|
|
|
|
|
|
fileName = fileLoggerSettings.fileName; |
|
|
|
|
|
|
|
|
|
// Convert relative fileName to absolute, based on the current working directory
|
|
|
|
|
if (QDir::isRelativePath(fileName)) |
|
|
|
|
{ |
|
|
|
|
if (QDir::isRelativePath(fileName)) { |
|
|
|
|
fileName = QFileInfo(QDir::currentPath(), fileName).absoluteFilePath(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -88,61 +88,63 @@ void FileLogger::refreshFileLogSettings()
@@ -88,61 +88,63 @@ void FileLogger::refreshFileLogSettings()
|
|
|
|
|
// Create new file if the filename has been changed
|
|
|
|
|
if (oldFileName != fileName) |
|
|
|
|
{ |
|
|
|
|
fprintf(stderr,"Logging to %s\n",qPrintable(fileName)); |
|
|
|
|
fprintf(stderr, "FileLogger::refreshQtSettings: Logging to new file %s\n", qPrintable(fileName)); |
|
|
|
|
close(); |
|
|
|
|
open(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
FileLogger::FileLogger(QSettings* settings, const int refreshInterval, QObject* parent) |
|
|
|
|
: Logger(parent), useQtSettings(true) |
|
|
|
|
FileLogger::FileLogger(QSettings* settings, const int refreshInterval, QObject* parent) : |
|
|
|
|
Logger(parent), fileName(""), useQtSettings(true) |
|
|
|
|
{ |
|
|
|
|
Q_ASSERT(settings!=0); |
|
|
|
|
Q_ASSERT(refreshInterval>=0); |
|
|
|
|
this->settings=settings; |
|
|
|
|
file=0; |
|
|
|
|
if (refreshInterval>0) |
|
|
|
|
{ |
|
|
|
|
refreshTimer.start(refreshInterval,this); |
|
|
|
|
Q_ASSERT(settings != 0); |
|
|
|
|
Q_ASSERT(refreshInterval >= 0); |
|
|
|
|
|
|
|
|
|
this->settings = settings; |
|
|
|
|
file = 0; |
|
|
|
|
|
|
|
|
|
if (refreshInterval > 0) { |
|
|
|
|
refreshTimer.start(refreshInterval, this); |
|
|
|
|
} |
|
|
|
|
flushTimer.start(1000,this); |
|
|
|
|
|
|
|
|
|
flushTimer.start(1000, this); |
|
|
|
|
|
|
|
|
|
refreshSettings(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
FileLogger::FileLogger(const FileLoggerSettings& settings, const int refreshInterval, QObject* parent) |
|
|
|
|
: Logger(parent), useQtSettings(false) |
|
|
|
|
FileLogger::FileLogger(const FileLoggerSettings& settings, const int refreshInterval, QObject* parent) : |
|
|
|
|
Logger(parent), fileName(""), useQtSettings(false) |
|
|
|
|
{ |
|
|
|
|
Q_ASSERT(refreshInterval>=0); |
|
|
|
|
Q_ASSERT(refreshInterval >= 0); |
|
|
|
|
|
|
|
|
|
fileLoggerSettings = settings; |
|
|
|
|
file=0; |
|
|
|
|
if (refreshInterval>0) |
|
|
|
|
{ |
|
|
|
|
refreshTimer.start(refreshInterval,this); |
|
|
|
|
file = 0; |
|
|
|
|
|
|
|
|
|
if (refreshInterval > 0) { |
|
|
|
|
refreshTimer.start(refreshInterval, this); |
|
|
|
|
} |
|
|
|
|
flushTimer.start(1000,this); |
|
|
|
|
|
|
|
|
|
flushTimer.start(1000, this); |
|
|
|
|
|
|
|
|
|
refreshSettings(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FileLogger::~FileLogger() |
|
|
|
|
{ |
|
|
|
|
close(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void FileLogger::write(const LogMessage* logMessage) |
|
|
|
|
{ |
|
|
|
|
// Try to write to the file
|
|
|
|
|
if (file) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
// Write the message
|
|
|
|
|
file->write(qPrintable(logMessage->toString(msgFormat,timestampFormat))); |
|
|
|
|
file->write(qPrintable(logMessage->toString(msgFormat, timestampFormat))); |
|
|
|
|
|
|
|
|
|
// Flush error messages immediately, to ensure that no important message
|
|
|
|
|
// gets lost when the program terinates abnormally.
|
|
|
|
|
if (logMessage->getType()>=QtCriticalMsg) |
|
|
|
|
{ |
|
|
|
|
if (logMessage->getType() >= QtCriticalMsg) { |
|
|
|
|
file->flush(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -150,14 +152,12 @@ void FileLogger::write(const LogMessage* logMessage)
@@ -150,14 +152,12 @@ void FileLogger::write(const LogMessage* logMessage)
|
|
|
|
|
if (file->error()) |
|
|
|
|
{ |
|
|
|
|
close(); |
|
|
|
|
qWarning("Cannot write to log file %s: %s",qPrintable(fileName),qPrintable(file->errorString())); |
|
|
|
|
fprintf(stderr, "FileLogger::write: Cannot write to log file %s: %s\n", qPrintable(fileName), qPrintable(file->errorString())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Fall-back to the super class method, if writing failed
|
|
|
|
|
if (!file) |
|
|
|
|
{ |
|
|
|
|
if (!file && useQtSettings) { |
|
|
|
|
Logger::write(logMessage); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -167,73 +167,76 @@ void FileLogger::open()
@@ -167,73 +167,76 @@ void FileLogger::open()
|
|
|
|
|
{ |
|
|
|
|
if (fileName.isEmpty()) |
|
|
|
|
{ |
|
|
|
|
qWarning("Name of logFile is empty"); |
|
|
|
|
fprintf(stderr, "FileLogger::open: Name of logFile is empty\n"); |
|
|
|
|
} |
|
|
|
|
else { |
|
|
|
|
file=new QFile(fileName); |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
file = new QFile(fileName); |
|
|
|
|
|
|
|
|
|
if (!file->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) |
|
|
|
|
{ |
|
|
|
|
qWarning("Cannot open log file %s: %s",qPrintable(fileName),qPrintable(file->errorString())); |
|
|
|
|
file=0; |
|
|
|
|
fprintf(stderr, "FileLogger::open: Cannot open log file %s: %s\n", qPrintable(fileName), qPrintable(file->errorString())); |
|
|
|
|
file = 0; |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
fprintf(stderr, "FileLogger::open: Opened log file %s\n", qPrintable(fileName)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void FileLogger::close() |
|
|
|
|
{ |
|
|
|
|
if (file) |
|
|
|
|
{ |
|
|
|
|
file->close(); |
|
|
|
|
delete file; |
|
|
|
|
file=0; |
|
|
|
|
file = 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void FileLogger::rotate() { |
|
|
|
|
void FileLogger::rotate() |
|
|
|
|
{ |
|
|
|
|
fprintf(stderr, "FileLogger::rotate\n"); |
|
|
|
|
// count current number of existing backup files
|
|
|
|
|
int count=0; |
|
|
|
|
int count = 0; |
|
|
|
|
|
|
|
|
|
forever |
|
|
|
|
{ |
|
|
|
|
QFile bakFile(QString("%1.%2").arg(fileName).arg(count+1)); |
|
|
|
|
if (bakFile.exists()) |
|
|
|
|
{ |
|
|
|
|
QFile bakFile(QString("%1.%2").arg(fileName).arg(count + 1)); |
|
|
|
|
|
|
|
|
|
if (bakFile.exists()) { |
|
|
|
|
++count; |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
} else { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Remove all old backup files that exceed the maximum number
|
|
|
|
|
while (maxBackups>0 && count>=maxBackups) |
|
|
|
|
while (maxBackups > 0 && count >= maxBackups) |
|
|
|
|
{ |
|
|
|
|
QFile::remove(QString("%1.%2").arg(fileName).arg(count)); |
|
|
|
|
--count; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Rotate backup files
|
|
|
|
|
for (int i=count; i>0; --i) { |
|
|
|
|
QFile::rename(QString("%1.%2").arg(fileName).arg(i),QString("%1.%2").arg(fileName).arg(i+1)); |
|
|
|
|
for (int i = count; i > 0; --i) |
|
|
|
|
{ |
|
|
|
|
QFile::rename(QString("%1.%2").arg(fileName).arg(i), QString("%1.%2").arg(fileName).arg(i + 1)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Backup the current logfile
|
|
|
|
|
QFile::rename(fileName,fileName+".1"); |
|
|
|
|
QFile::rename(fileName, fileName + ".1"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void FileLogger::timerEvent(QTimerEvent* event) |
|
|
|
|
{ |
|
|
|
|
if (!event) |
|
|
|
|
{ |
|
|
|
|
if (!event) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
else if (event->timerId()==refreshTimer.timerId()) |
|
|
|
|
{ |
|
|
|
|
} else if (event->timerId() == refreshTimer.timerId()) { |
|
|
|
|
refreshSettings(); |
|
|
|
|
} |
|
|
|
|
else if (event->timerId()==flushTimer.timerId() && file) |
|
|
|
|
else if (event->timerId() == flushTimer.timerId() && file) |
|
|
|
|
{ |
|
|
|
|
mutex.lock(); |
|
|
|
|
|
|
|
|
|
@ -241,7 +244,7 @@ void FileLogger::timerEvent(QTimerEvent* event)
@@ -241,7 +244,7 @@ void FileLogger::timerEvent(QTimerEvent* event)
|
|
|
|
|
file->flush(); |
|
|
|
|
|
|
|
|
|
// Rotate the file if it is too large
|
|
|
|
|
if (maxSize>0 && file->size()>=maxSize) |
|
|
|
|
if (maxSize > 0 && file->size() >= maxSize) |
|
|
|
|
{ |
|
|
|
|
close(); |
|
|
|
|
rotate(); |
|
|
|
|
|