Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: add logs

Browse Source
This commit is contained in:
semenov
2025-08-12 14:59:43 +03:00
parent c80bab5a66
commit 07e082e967
13 changed files with 494 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ServerLMS/Systems/logger.cpp
View File

@@ -61,6 +61,7 @@ void Logger::handleLog(QString msg, LogLevel logLevel)
case WARNING: level = "WARNING"; break;
case ERROR: level = "ERROR"; break;
case CRITICAL: level = "CRITICAL"; break;
case DEBUG: level = "DEBUG"; break;
}
QString timeStamp = QDateTime::currentDateTime().toString("hh:mm:ss");

3
ServerLMS/Systems/logger.h
View File

@@ -14,7 +14,8 @@ enum LogLevel
INFO,
WARNING,
ERROR,
CRITICAL
CRITICAL,
DEBUG
};
enum LoggingType

6
ServerLMS/Systems/recognizesystem.cpp
View File

@@ -67,7 +67,6 @@ void RecognizeSystem::recognize()
stream.readRawData(read,4);
int numPackage = *((int*)read);
packetType = static_cast<PacketType>(numPackage);
socket->peek(read,4);
if(!stream.commitTransaction()) continue;
continue;
@@ -81,6 +80,9 @@ void RecognizeSystem::recognize()
}
if (packetType != PacketType::TYPE_NONE)
Logger::instance().log("C: " + client->getLogin() + " RECEIVE pack " + enumToString(packetType),LogLevel::DEBUG);
if (packetType == PacketType::TYPE_COMMAND) //TODO: надо переделать под какой то нормальный тип, который уже существует
{
stream.startTransaction();
@@ -453,7 +455,7 @@ void RecognizeSystem::packetTypeInit(PacketType packet,Client *client)
}
isPackageTypeInited = true;
Logger::instance().log("C: " + client->getLogin() + " send pack " + enumToString(packetType));
packetType = PacketType::TYPE_NONE;
}

13
ServerLMS/Systems/sendsystem.cpp
View File

@@ -35,9 +35,6 @@ void SendSystem::sendFileBlock(QString path)
QFile file(path);
QFileInfo fileInfo(file);
if(file.isOpen()) Logger::instance().log("ALREADY OPEN FILE : " + client->getLogin() + " " + fileInfo.filePath());
Logger::instance().log("OPEN FILE : " + client->getLogin() + " " + fileInfo.fileName());
if(isSendStopped)
{ //Поведение на случай отключения клиента
file.close();
@@ -49,13 +46,11 @@ void SendSystem::sendFileBlock(QString path)
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
fileSize = file.size();
Logger::instance().log("size FILE :" + client->getLogin() + " " + QString::number(fileSize));
if (fileSize == 0)
{
Logger::instance().log("Client: " + client->getLogin() + " WARNING! Zero size " + fileInfo.fileName(),LogLevel::ERROR);
Logger::instance().log(path,LogLevel::ERROR);
Logger::instance().log("UNLOCK SIZE MUTEX : " + client->getLogin(),LogLevel::ERROR);
return;
}
@@ -77,9 +72,7 @@ void SendSystem::sendFileBlock(QString path)
//emit sigSendToLogger(Tools::getTime() + " send file " + fileInfo.fileName());
}
Logger::instance().log("Sended to : " + client->getLogin() + " : " + fileInfo.fileName());
file.close();
Logger::instance().log("CLOSE FILE : " + client->getLogin() + " " + fileInfo.fileName());
countSend = 0;
}
@@ -194,6 +187,7 @@ void SendSystem::sendDeleteBlock(QString path)
void SendSystem::sendPacketType(PacketType packetType)
{
Logger::instance().log("C: " + client->getLogin() + " send pack " + enumToString(packetType), LogLevel::DEBUG);
if (client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT ||
client->getClientType() == TypeClientAutorization::TYPE_GUI)
{
@@ -227,13 +221,16 @@ void SendSystem::sendNotify(QString notify)
void SendSystem::sendXmlAnswer(QByteArray array, PacketType packetType)
{
qDebug() << "SendSystemThread: " << QThread::currentThreadId();
Logger::instance().log("C: " + client->getLogin() + " send pack " + enumToString(packetType) +
" " + QString::fromUtf8(array),LogLevel::DEBUG);
if (client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT ||
client->getClientType() == TypeClientAutorization::TYPE_GUI)
{
QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
stream << /*PacketType::TYPE_XMLANSWER*/packetType;
stream << packetType;
stream << array;
socket->waitForBytesWritten();
}