mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-10-31 08:14:29 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update QsLog to 2.1 snapshot 46b643d5bcbc

Browse Source
This commit is contained in:
Felix Kauselmann
2020-07-24 19:05:01 +02:00
parent c13ec618d0
commit 1568a5f253
45 changed files with 2579 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
third_party/QsLog/QsLogDestFile.cpp vendored
View File

@ -26,21 +26,13 @@
#include "QsLogDestFile.h"
#include <QTextCodec>
#include <QDateTime>
#include <QString>
#include <QtGlobal>
#include <iostream>
const int QsLogging::SizeRotationStrategy::MaxBackupCount = 10;
QsLogging::RotationStrategy::~RotationStrategy()
{
}
QsLogging::SizeRotationStrategy::SizeRotationStrategy()
: mCurrentSizeInBytes(0)
, mMaxSizeInBytes(0)
, mBackupsCount(0)
{
}
QsLogging::RotationStrategy::~RotationStrategy() noexcept = default;
void QsLogging::SizeRotationStrategy::setInitialInfo(const QFile &file)
{
@ -48,9 +40,20 @@ void QsLogging::SizeRotationStrategy::setInitialInfo(const QFile &file)
mCurrentSizeInBytes = file.size();
}
void QsLogging::SizeRotationStrategy::setInitialInfo(const QString &filePath, int fileSize)
{
mFileName = filePath;
mCurrentSizeInBytes = fileSize;
}
void QsLogging::SizeRotationStrategy::includeMessageInCalculation(const QString &message)
{
mCurrentSizeInBytes += message.toUtf8().size();
includeMessageInCalculation(message.toUtf8());
}
void QsLogging::SizeRotationStrategy::includeMessageInCalculation(const QByteArray &message)
{
mCurrentSizeInBytes += message.size();
}
bool QsLogging::SizeRotationStrategy::shouldRotate()
@ -63,8 +66,9 @@ bool QsLogging::SizeRotationStrategy::shouldRotate()
void QsLogging::SizeRotationStrategy::rotate()
{
if (!mBackupsCount) {
if (!QFile::remove(mFileName))
if (!removeFileAtPath(mFileName)) {
std::cerr << "QsLog: backup delete failed " << qPrintable(mFileName);
}
return;
}
@ -73,18 +77,19 @@ void QsLogging::SizeRotationStrategy::rotate()
int lastExistingBackupIndex = 0;
for (int i = 1;i <= mBackupsCount;++i) {
const QString backupFileName = logNamePattern.arg(i);
if (QFile::exists(backupFileName))
if (fileExistsAtPath(backupFileName)) {
lastExistingBackupIndex = qMin(i, mBackupsCount - 1);
else
} else {
break;
}
}
// 2. shift up
for (int i = lastExistingBackupIndex;i >= 1;--i) {
const QString oldName = logNamePattern.arg(i);
const QString newName = logNamePattern.arg(i + 1);
QFile::remove(newName);
const bool renamed = QFile::rename(oldName, newName);
removeFileAtPath(newName);
const bool renamed = renameFileFromTo(oldName, newName);
if (!renamed) {
std::cerr << "QsLog: could not rename backup " << qPrintable(oldName)
<< " to " << qPrintable(newName);
@ -93,9 +98,10 @@ void QsLogging::SizeRotationStrategy::rotate()
// 3. rename current log file
const QString newName = logNamePattern.arg(1);
if (QFile::exists(newName))
QFile::remove(newName);
if (!QFile::rename(mFileName, newName)) {
if (fileExistsAtPath(newName)) {
removeFileAtPath(newName);
}
if (!renameFileFromTo(mFileName, newName)) {
std::cerr << "QsLog: could not rename log " << qPrintable(mFileName)
<< " to " << qPrintable(newName);
}
@ -118,33 +124,53 @@ void QsLogging::SizeRotationStrategy::setBackupCount(int backups)
mBackupsCount = qMin(backups, SizeRotationStrategy::MaxBackupCount);
}
bool QsLogging::SizeRotationStrategy::removeFileAtPath(const QString &path)
{
return QFile::remove(path);
}
QsLogging::FileDestination::FileDestination(const QString& filePath, RotationStrategyPtr rotationStrategy)
: mRotationStrategy(rotationStrategy)
bool QsLogging::SizeRotationStrategy::fileExistsAtPath(const QString &path)
{
return QFile::exists(path);
}
bool QsLogging::SizeRotationStrategy::renameFileFromTo(const QString &from, const QString &to)
{
return QFile::rename(from, to);
}
const char* const QsLogging::FileDestination::Type = "file";
QsLogging::FileDestination::FileDestination(const QString& filePath, RotationStrategyPtrU&& rotationStrategy)
: mRotationStrategy(std::move(rotationStrategy))
{
mFile.setFileName(filePath);
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag())) {
std::cerr << "QsLog: could not open log file " << qPrintable(filePath);
}
mOutputStream.setDevice(&mFile);
mOutputStream.setCodec(QTextCodec::codecForName("UTF-8"));
mRotationStrategy->setInitialInfo(mFile);
}
void QsLogging::FileDestination::write(const QString& message, Level)
void QsLogging::FileDestination::write(const LogMessage& message)
{
mRotationStrategy->includeMessageInCalculation(message);
const QByteArray utf8Message = message.formatted.toUtf8();
mRotationStrategy->includeMessageInCalculation(utf8Message);
if (mRotationStrategy->shouldRotate()) {
mOutputStream.setDevice(NULL);
mOutputStream.setDevice(nullptr);
mFile.close();
mRotationStrategy->rotate();
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag())) {
std::cerr << "QsLog: could not reopen log file " << qPrintable(mFile.fileName());
}
mRotationStrategy->setInitialInfo(mFile);
mOutputStream.setDevice(&mFile);
mOutputStream.setCodec(QTextCodec::codecForName("UTF-8"));
}
mOutputStream << message << endl;
mOutputStream << utf8Message << endl;
mOutputStream.flush();
}
@ -153,3 +179,8 @@ bool QsLogging::FileDestination::isValid()
return mFile.isOpen();
}
QString QsLogging::FileDestination::type() const
{
return QString::fromLatin1(Type);
}