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

refact 0

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-22 11:48:21 +03:00
parent 4ba70853cb
commit 75acf12c3c
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibServer/Systems/logger.cpp
View File

@@ -84,7 +84,7 @@ void Logger::handleLog(QString msg, LogLevel logLevel)
case WARNING: case WARNING:
level = "WARNING"; level = "WARNING";
colorLevel = "yellow"; colorLevel = "orange";
break; break;
case ERROR: case ERROR:

15
LibServer/multithreadserver/multithreadserver.cpp
View File

@@ -151,16 +151,18 @@ bool MultiThreadServer::slot_BlockAutorization(bool block, QString whoFullName,
{ {
bool res = true; bool res = true;
bool blockRes = false; bool blockRes = false;
QString key = whoFullName + " [type:" + type + "]";
QString strTypes = "";
if(block) if(block)
{ {
this->blockAutorization(); this->blockAutorization();
blockersMap.insert(whoFullName, type); blockersMap.insert(key, type);
blockRes = true; blockRes = true;
} }
else else
{ {
blockersMap.take(whoFullName); blockersMap.take(key);
if(!blockersMap.count()) if(!blockersMap.count())
{ {
this->unBlockAutorization(); this->unBlockAutorization();
@@ -177,7 +179,14 @@ bool MultiThreadServer::slot_BlockAutorization(bool block, QString whoFullName,
else else
emit signal_sendPacketToAllClients(PacketType::FREE); emit signal_sendPacketToAllClients(PacketType::FREE);
emit signal_BlockAutorizationIndicate(block, whoFullName, type); foreach(QString keyLocal, blockersMap.keys())
{
if(strTypes != "")
strTypes += ", ";
strTypes += (blockersMap[keyLocal]);
}
emit signal_BlockAutorizationIndicate(block, key, strTypes);
} }
return res; return res;

2
LibServer/multithreadserver/multithreadserver.h
View File

@@ -46,7 +46,7 @@ signals:
UpdateController *updateController, DataParser *dataParser); UpdateController *updateController, DataParser *dataParser);
void signalStopSendFile(); void signalStopSendFile();
void signal_BlockAutorizationIndicate(bool block, QString whoFullName, QString type); void signal_BlockAutorizationIndicate(bool block, QString blocker, QString types);
void signal_sendPacketToAllClients(PacketType packetType); void signal_sendPacketToAllClients(PacketType packetType);
public slots: public slots:

10
LibServer/serverlmswidget.cpp
View File

@@ -191,17 +191,21 @@ void ServerLMSWidget::start()
startInitialization_step0(); startInitialization_step0();
} }
void ServerLMSWidget::slot_BlockAutorizationIndicate(bool block, QString whoFullName, QString type) void ServerLMSWidget::slot_BlockAutorizationIndicate(bool block, QString blocker, QString types)
{ {
if(block) if(block)
{ {
//server->blockAutorization(); //server->blockAutorization();
Logger::instance().log(QString("Server BLOCK from: %1 [type: %2]").arg(whoFullName, type)); Logger::instance().log(QString("BLOCK from: %1").arg(blocker), LogLevel::INFO);
//if(type != "")
Logger::instance().log(QString("Blockers: %1").arg(types), LogLevel::DEBUG);
} }
else else
{ {
//server->unBlockAutorization(); //server->unBlockAutorization();
Logger::instance().log(QString("Server UNBLOCK from: %1 [type: %2]").arg(whoFullName, type)); Logger::instance().log(QString("UNBLOCK from: %1").arg(blocker), LogLevel::INFO);
//if(type != "")
Logger::instance().log(QString("Blockers: %1").arg(types), LogLevel::DEBUG);
} }
updateStateOnlyServer(); updateStateOnlyServer();
} }

2
LibServer/serverlmswidget.h
View File

@@ -91,7 +91,7 @@ signals:
public slots: public slots:
void slot_LanguageChanged(QString language); void slot_LanguageChanged(QString language);
void slot_UpdateListClients(); void slot_UpdateListClients();
void slot_BlockAutorizationIndicate(bool block, QString whoFullName, QString type); void slot_BlockAutorizationIndicate(bool block, QString blocker, QString types);
void slot_AddMessageToLog(QString message); void slot_AddMessageToLog(QString message);
void slot_ErrorPostgreSQL(QString text); void slot_ErrorPostgreSQL(QString text);