改进很多代码

This commit is contained in:
feiyangqingyun
2021-10-30 19:20:24 +08:00
parent cb138c2ec5
commit f027369f27
104 changed files with 842 additions and 348 deletions

View File

@@ -20,25 +20,107 @@ frmSaveLog::~frmSaveLog()
void frmSaveLog::initForm()
{
//启动定时器追加数据
count = 0;
timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(append()));
timer->setInterval(1000);
timer->setInterval(100);
SaveLog::Instance()->setPath(qApp->applicationDirPath());
//添加消息类型
QStringList types, datas;
types << "Debug" << "Info" << "Warning" << "Critical" << "Fatal";
datas << "1" << "2" << "4" << "8" << "16";
ui->cboxType->addItems(types);
//添加消息类型到列表用于勾选设置哪些类型需要重定向
int count = types.count();
for (int i = 0; i < count; ++i) {
QListWidgetItem *item = new QListWidgetItem;
item->setText(types.at(i));
item->setData(Qt::UserRole, datas.at(i));
item->setCheckState(Qt::Checked);
ui->listType->addItem(item);
}
//添加日志文件大小下拉框
ui->cboxSize->addItem("不启用", 0);
ui->cboxSize->addItem("5kb", 5);
ui->cboxSize->addItem("10kb", 10);
ui->cboxSize->addItem("30kb", 30);
ui->cboxSize->addItem("1mb", 1024);
ui->cboxRow->addItem("不启用", 0);
ui->cboxRow->addItem("100条", 100);
ui->cboxRow->addItem("500条", 500);
ui->cboxRow->addItem("2000条", 2000);
ui->cboxRow->addItem("10000条", 10000);
//设置是否开启日志上下文打印比如行号、函数等
SaveLog::Instance()->setUseContext(false);
//设置文件存储目录
SaveLog::Instance()->setPath(qApp->applicationDirPath() + "/log");
}
void frmSaveLog::append()
void frmSaveLog::append(const QString &flag)
{
QString msg = QString("当前时间: %1 测试打印输出消息").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"));
if (count >= 100) {
count = 0;
ui->txtMain->clear();
}
QString str1;
int type = ui->cboxType->currentIndex();
if (!ui->ckSave->isChecked()) {
if (type == 0) {
str1 = "Debug ";
} else if (type == 1) {
str1 = "Infox ";
} else if (type == 2) {
str1 = "Warnx ";
} else if (type == 3) {
str1 = "Error ";
} else if (type == 4) {
str1 = "Fatal ";
}
}
QString str2 = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
QString str3 = flag.isEmpty() ? "自动插入消息" : flag;
QString msg = QString("%1当前时间: %2 %3").arg(str1).arg(str2).arg(str3);
//开启网络重定向换成英文方便接收解析不乱码
//对方接收解析的工具未必是utf8
if (ui->ckNet->isChecked()) {
msg = QString("%1time: %2 %3").arg(str1).arg(str2).arg("(QQ: 517216493 WX: feiyangqingyun)");
}
count++;
ui->txtMain->append(msg);
qDebug() << msg;
//根据不同的类型打印
//TMD转换要分两部走不然msvc的debug版本会乱码(英文也一样)
//char *data = msg.toUtf8().data();
QByteArray buffer = msg.toUtf8();
const char *data = buffer.constData();
if (type == 0) {
qDebug(data);
} else if (type == 1) {
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
qInfo(data);
#endif
} else if (type == 2) {
qWarning(data);
} else if (type == 3) {
qCritical(data);
} else if (type == 4) {
//调用下面这个打印完会直接退出程序
qFatal(data);
}
}
void frmSaveLog::on_btnDebug_clicked()
void frmSaveLog::on_btnLog_clicked()
{
QString msg = QString("当前时间: %1 手动插入消息").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"));
ui->txtMain->append(msg);
qDebug() << msg;
append("手动插入消息");
}
void frmSaveLog::on_ckTimer_stateChanged(int arg1)
@@ -47,12 +129,15 @@ void frmSaveLog::on_ckTimer_stateChanged(int arg1)
timer->stop();
} else {
timer->start();
on_btnLog_clicked();
}
}
void frmSaveLog::on_ckNet_stateChanged(int arg1)
{
SaveLog::Instance()->setToNet(arg1 != 0);
SaveLog::Instance()->setListenPort(ui->txtPort->text().toInt());
SaveLog::Instance()->setToNet(ui->ckNet->isChecked());
on_btnLog_clicked();
}
void frmSaveLog::on_ckSave_stateChanged(int arg1)
@@ -61,5 +146,42 @@ void frmSaveLog::on_ckSave_stateChanged(int arg1)
SaveLog::Instance()->stop();
} else {
SaveLog::Instance()->start();
on_btnLog_clicked();
}
}
void frmSaveLog::on_cboxSize_currentIndexChanged(int index)
{
int size = ui->cboxSize->itemData(index).toInt();
SaveLog::Instance()->setMaxSize(size);
on_btnLog_clicked();
}
void frmSaveLog::on_cboxRow_currentIndexChanged(int index)
{
int row = ui->cboxRow->itemData(index).toInt();
SaveLog::Instance()->setMaxRow(row);
on_btnLog_clicked();
}
void frmSaveLog::on_listType_itemPressed(QListWidgetItem *item)
{
if (item <= 0) {
return;
}
//切换选中行状态
item->setCheckState(item->checkState() == Qt::Checked ? Qt::Unchecked : Qt::Checked);
//找到所有勾选的类型进行设置
quint8 types = 0;
int count = ui->listType->count();
for (int i = 0; i < count; ++i) {
QListWidgetItem *item = ui->listType->item(i);
if (item->checkState() == Qt::Checked) {
types += item->data(Qt::UserRole).toInt();
}
}
SaveLog::Instance()->setMsgType((MsgType)types);
}

View File

@@ -2,6 +2,7 @@
#define FRMSAVELOG_H
#include <QWidget>
#include <QListWidgetItem>
namespace Ui {
class frmSaveLog;
@@ -17,15 +18,22 @@ public:
private:
Ui::frmSaveLog *ui;
int count;
QTimer *timer;
private slots:
void initForm();
void append();
void on_btnDebug_clicked();
void append(const QString &flag = QString());
private slots:
void on_btnLog_clicked();
void on_ckTimer_stateChanged(int arg1);
void on_ckNet_stateChanged(int arg1);
void on_ckSave_stateChanged(int arg1);
void on_ckSave_stateChanged(int arg1);
void on_cboxSize_currentIndexChanged(int index);
void on_cboxRow_currentIndexChanged(int index);
void on_listType_itemPressed(QListWidgetItem *item);
};
#endif // FRMSAVELOG_H

View File

@@ -13,60 +13,119 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTextEdit" name="txtMain"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="btnDebug">
<property name="minimumSize">
<size>
<width>130</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>手动插入消息</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckTimer">
<property name="text">
<string>定时器打印消息</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckNet">
<property name="text">
<string>重定向到网络</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckSave">
<property name="text">
<string>保存日志</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<widget class="QFrame" name="frame">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QComboBox" name="cboxSize"/>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cboxRow"/>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cboxType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labSize">
<property name="text">
<string>文件大小</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labRow">
<property name="text">
<string>文件行数</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labType">
<property name="text">
<string>消息类型</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labPort">
<property name="text">
<string>监听端口</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="txtPort">
<property name="text">
<string>6000</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QListWidget" name="listType"/>
</item>
<item>
<widget class="QCheckBox" name="ckSave">
<property name="text">
<string>开启日志重定向</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckNet">
<property name="text">
<string>日志输出到网络</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckTimer">
<property name="text">
<string>定时器打印消息</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnLog">
<property name="text">
<string>手动插入消息</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>

View File

@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
#endif
frmSaveLog w;
w.setWindowTitle("输出日志文件");
w.setWindowTitle("日志重定向示例 V2022 (QQ: 517216493 WX: feiyangqingyun)");
w.show();
return a.exec();

1
savelog/readme.txt Normal file
View File

@@ -0,0 +1 @@
目前发现msvc的qt debug模式的可能数据不正确不知道debug编码做了什么处理

View File

@@ -1,4 +1,6 @@
#include "savelog.h"
#pragma execution_character_set("utf-8")
#include "savelog.h"
#include "qmutex.h"
#include "qdir.h"
#include "qfile.h"
@@ -10,6 +12,7 @@
#include "qstringlist.h"
#define QDATE qPrintable(QDate::currentDate().toString("yyyy-MM-dd"))
#define QDATETIMS qPrintable(QDateTime::currentDateTime().toString("yyyy-MM-dd-HH-mm-ss"))
//日志重定向
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
@@ -24,24 +27,42 @@ void Log(QtMsgType type, const char *msg)
QString content;
//这里可以根据不同的类型加上不同的头部用于区分
int msgType = SaveLog::Instance()->getMsgType();
switch (type) {
case QtDebugMsg:
content = QString("%1").arg(msg);
if ((msgType & MsgType_Debug) == MsgType_Debug) {
content = QString("Debug %1").arg(msg);
}
break;
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
case QtInfoMsg:
if ((msgType & MsgType_Info) == MsgType_Info) {
content = QString("Infox %1").arg(msg);
}
break;
#endif
case QtWarningMsg:
content = QString("%1").arg(msg);
if ((msgType & MsgType_Warning) == MsgType_Warning) {
content = QString("Warnx %1").arg(msg);
}
break;
case QtCriticalMsg:
content = QString("%1").arg(msg);
if ((msgType & MsgType_Critical) == MsgType_Critical) {
content = QString("Error %1").arg(msg);
}
break;
case QtFatalMsg:
content = QString("%1").arg(msg);
if ((msgType & MsgType_Fatal) == MsgType_Fatal) {
content = QString("Fatal %1").arg(msg);
}
break;
}
//没有内容则返回
if (content.isEmpty()) {
return;
}
//加上打印代码所在代码文件、行号、函数名
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
if (SaveLog::Instance()->getUseContext()) {
@@ -54,6 +75,7 @@ void Log(QtMsgType type, const char *msg)
}
#endif
//还可以将数据转成html内容分颜色区分
//将内容传给函数进行处理
SaveLog::Instance()->save(content);
}
@@ -78,10 +100,14 @@ SaveLog::SaveLog(QObject *parent) : QObject(parent)
//估计日志钩子可能单独开了线程
connect(this, SIGNAL(send(QString)), SendLog::Instance(), SLOT(send(QString)));
file = new QFile(this);
isRun = false;
maxRow = currentRow = 0;
maxSize = 128;
toNet = false;
useContext = true;
//全局的文件对象,在需要的时候打开而不是每次添加日志都打开
file = new QFile(this);
//默认取应用程序根目录
path = qApp->applicationDirPath();
//默认取应用程序可执行文件名称
@@ -89,6 +115,9 @@ SaveLog::SaveLog(QObject *parent) : QObject(parent)
QStringList list = str.split("/");
name = list.at(list.count() - 1).split(".").at(0);
fileName = "";
//默认所有类型都输出
msgType = MsgType(MsgType_Debug | MsgType_Info | MsgType_Warning | MsgType_Critical | MsgType_Fatal);
}
SaveLog::~SaveLog()
@@ -96,14 +125,40 @@ SaveLog::~SaveLog()
file->close();
}
void SaveLog::openFile(const QString &fileName)
{
//当文件名改变时才新建和打开文件而不是每次都打开文件(效率极低)或者一开始打开文件
if (this->fileName != fileName) {
this->fileName = fileName;
//先关闭之前的
if (file->isOpen()) {
file->close();
}
//重新设置新的日志文件
file->setFileName(fileName);
//以 Append 追加的形式打开
file->open(QIODevice::WriteOnly | QIODevice::Append | QFile::Text);
}
}
bool SaveLog::getUseContext()
{
return this->useContext;
}
MsgType SaveLog::getMsgType()
{
return this->msgType;
}
//安装日志钩子,输出调试信息到文件,便于调试
void SaveLog::start()
{
if (isRun) {
return;
}
isRun = true;
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
qInstallMessageHandler(Log);
#else
@@ -114,6 +169,12 @@ void SaveLog::start()
//卸载日志钩子
void SaveLog::stop()
{
if (!isRun) {
return;
}
isRun = false;
this->clear();
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
qInstallMessageHandler(0);
#else
@@ -121,38 +182,97 @@ void SaveLog::stop()
#endif
}
void SaveLog::clear()
{
currentRow = 0;
fileName.clear();
if (file->isOpen()) {
file->close();
}
}
void SaveLog::save(const QString &content)
{
//如果重定向输出到网络则通过网络发出去,否则输出到日志文件
if (toNet) {
emit send(content);
} else {
//检查目录是否存在,不存在则先新建
//目录不存在则先新建目录
QDir dir(path);
if (!dir.exists()) {
dir.mkdir(path);
}
//方法改进:之前每次输出日志都打开文件,改成只有当日期改变时才新建和打开文件
QString fileName = QString("%1/%2_log_%3.txt").arg(path).arg(name).arg(QDATE);
if (this->fileName != fileName) {
this->fileName = fileName;
if (file->isOpen()) {
file->close();
//日志存储规则有多种策略 优先级 行数>大小>日期
//1: 设置了最大行数限制则按照行数限制来
//2: 设置了大小则按照大小来控制日志文件
//3: 都没有设置都存储到日期命名的文件,只有当日期变化了才会切换到新的日志文件
bool needOpen = false;
if (maxRow > 0) {
currentRow++;
if (fileName.isEmpty()) {
needOpen = true;
} else if (currentRow >= maxRow) {
needOpen = true;
}
file->setFileName(fileName);
file->open(QIODevice::WriteOnly | QIODevice::Append | QFile::Text);
} else if (maxSize > 0) {
//1MB=1024*1024 经过大量测试 QFile().size() 方法速度非常快
//首次需要重新打开文件以及超过大小需要重新打开文件
if (fileName.isEmpty()) {
needOpen = true;
} else if (file->size() > (maxSize * 1024)) {
needOpen = true;
}
} else {
//日期改变了才会触发
QString fileName = QString("%1/%2_log_%3.txt").arg(path).arg(name).arg(QDATE);
openFile(fileName);
}
QTextStream logStream(file);
logStream << content << "\n";
if ((maxRow > 0 || maxSize > 0) && needOpen) {
currentRow = 0;
QString fileName = QString("%1/%2_log_%3.txt").arg(path).arg(name).arg(QDATETIMS);
openFile(fileName);
}
//用文本流的输出速度更快
QTextStream stream(file);
stream.setCodec("utf-8");
stream << content << "\n";
}
}
void SaveLog::setMaxRow(int maxRow)
{
//这里可以限定最大最小值
if (maxRow >= 0) {
this->maxRow = maxRow;
this->clear();
}
}
void SaveLog::setMaxSize(int maxSize)
{
//这里可以限定最大最小值
if (maxSize >= 0) {
this->maxSize = maxSize;
this->clear();
}
}
void SaveLog::setListenPort(int listenPort)
{
SendLog::Instance()->setListenPort(listenPort);
}
void SaveLog::setToNet(bool toNet)
{
this->toNet = toNet;
if (toNet) {
SendLog::Instance()->start();
} else {
SendLog::Instance()->stop();
}
}
void SaveLog::setUseContext(bool useContext)
@@ -170,6 +290,11 @@ void SaveLog::setName(const QString &name)
this->name = name;
}
void SaveLog::setMsgType(const MsgType &msgType)
{
this->msgType = msgType;
}
//网络发送日志数据类
QScopedPointer<SendLog> SendLog::self;
@@ -186,18 +311,14 @@ SendLog *SendLog::Instance()
return self.data();
}
SendLog::SendLog(QObject *parent)
SendLog::SendLog(QObject *parent) : QObject(parent)
{
listenPort = 6000;
socket = NULL;
//实例化网络通信服务器对象
server = new QTcpServer(this);
connect(server, SIGNAL(newConnection()), this, SLOT(newConnection()));
int listenPort = 6000;
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
server->listen(QHostAddress::AnyIPv4, listenPort);
#else
server->listen(QHostAddress::Any, listenPort);
#endif
}
SendLog::~SendLog()
@@ -211,15 +332,41 @@ SendLog::~SendLog()
void SendLog::newConnection()
{
//限定就一个连接
while (server->hasPendingConnections()) {
socket = server->nextPendingConnection();
}
}
void SendLog::setListenPort(int listenPort)
{
this->listenPort = listenPort;
}
void SendLog::start()
{
//启动端口监听
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
server->listen(QHostAddress::AnyIPv4, listenPort);
#else
server->listen(QHostAddress::Any, listenPort);
#endif
}
void SendLog::stop()
{
if (socket != NULL) {
socket->disconnectFromHost();
socket = NULL;
}
server->close();
}
void SendLog::send(const QString &content)
{
if (socket != NULL && socket->isOpen()) {
socket->write(content.toUtf8());
socket->flush();
//socket->flush();
}
}

View File

@@ -7,9 +7,14 @@
* 2. 支持日志存储的目录。
* 3. 支持网络发出打印日志。
* 4. 支持输出日志上下文信息比如所在代码文件、行号、函数名等。
* 5. 支持Qt4+Qt5+Qt6开箱即用
* 6. 自动加锁支持多线程
* 7. 使用做到最简单start即可
* 5. 支持设置日志文件大小限制超过则自动分文件默认128kb
* 6. 支持按照日志行数自动分文件,和日志大小条件互斥
* 7. 可选按照日期时间区分文件名存储日志
* 8. 日志文件命名规则优先级:行数》大小》日期。
* 9. 自动加锁支持多线程。
* 10. 可以分别控制哪些类型的日志需要重定向输出。
* 11. 支持Qt4+Qt5+Qt6开箱即用。
* 12. 使用方式最简单调用函数start()启动服务stop()停止服务。
*/
#include <QObject>
@@ -18,6 +23,15 @@ class QFile;
class QTcpSocket;
class QTcpServer;
//消息类型
enum MsgType {
MsgType_Debug = 0x0001,
MsgType_Info = 0x0002,
MsgType_Warning = 0x0004,
MsgType_Critical = 0x0008,
MsgType_Fatal = 0x0010,
};
#ifdef quc
class Q_DECL_EXPORT SaveLog : public QObject
#else
@@ -34,21 +48,34 @@ public:
private:
static QScopedPointer<SaveLog> self;
//文件对象
QFile *file;
//是否在运行
bool isRun;
//文件最大行数 0表示不启用
int maxRow, currentRow;
//文件最大大小 0表示不启用 单位kb
int maxSize;
//是否重定向到网络
bool toNet;
//是否输出日志上下文
bool useContext;
//文件对象
QFile *file;
//日志文件路径
QString path;
//日志文件名称
QString name;
//日志文件完整名称
QString fileName;
//消息类型
MsgType msgType;
private:
void openFile(const QString &fileName);
public:
bool getUseContext();
MsgType getMsgType();
Q_SIGNALS:
//发送内容信号
@@ -59,20 +86,38 @@ public Q_SLOTS:
void start();
//暂停日志服务
void stop();
//清空状态
void clear();
//保存日志
void save(const QString &content);
//设置日志文件最大行数
void setMaxRow(int maxRow);
//设置日志文件最大大小 单位kb
void setMaxSize(int maxSize);
//设置监听端口
void setListenPort(int listenPort);
//设置是否重定向到网络
void setToNet(bool toNet);
//设置是否输出日志上下文
void setUseContext(bool useContext);
//设置日志文件存放路径
void setPath(const QString &path);
//设置日志文件名称
void setName(const QString &name);
//设置消息类型
void setMsgType(const MsgType &msgType);
};
#ifdef quc
class Q_DECL_EXPORT SendLog : public QObject
#else
class SendLog : public QObject
#endif
{
Q_OBJECT
public:
@@ -83,6 +128,8 @@ public:
private:
static QScopedPointer<SendLog> self;
//监听端口
int listenPort;
//网络通信对象
QTcpSocket *socket;
//网络监听服务器
@@ -93,6 +140,13 @@ private slots:
void newConnection();
public Q_SLOTS:
//设置监听端口
void setListenPort(int listenPort);
//启动和停止服务
void start();
void stop();
//发送日志
void send(const QString &content);
};