diff --git a/LibServer/Systems/logger.cpp b/LibServer/Systems/logger.cpp index 4cd80f6..c280f62 100644 --- a/LibServer/Systems/logger.cpp +++ b/LibServer/Systems/logger.cpp @@ -84,7 +84,7 @@ void Logger::handleLog(QString msg, LogLevel logLevel) case WARNING: level = "WARNING"; - colorLevel = "yellow"; + colorLevel = "orange"; break; case ERROR: diff --git a/LibServer/multithreadserver/multithreadserver.cpp b/LibServer/multithreadserver/multithreadserver.cpp index 1fb23e6..00f1088 100644 --- a/LibServer/multithreadserver/multithreadserver.cpp +++ b/LibServer/multithreadserver/multithreadserver.cpp @@ -151,16 +151,18 @@ bool MultiThreadServer::slot_BlockAutorization(bool block, QString whoFullName, { bool res = true; bool blockRes = false; + QString key = whoFullName + " [type:" + type + "]"; + QString strTypes = ""; if(block) { this->blockAutorization(); - blockersMap.insert(whoFullName, type); + blockersMap.insert(key, type); blockRes = true; } else { - blockersMap.take(whoFullName); + blockersMap.take(key); if(!blockersMap.count()) { this->unBlockAutorization(); @@ -177,7 +179,14 @@ bool MultiThreadServer::slot_BlockAutorization(bool block, QString whoFullName, else 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; diff --git a/LibServer/multithreadserver/multithreadserver.h b/LibServer/multithreadserver/multithreadserver.h index a2f5b2c..1dabd79 100644 --- a/LibServer/multithreadserver/multithreadserver.h +++ b/LibServer/multithreadserver/multithreadserver.h @@ -46,7 +46,7 @@ signals: UpdateController *updateController, DataParser *dataParser); 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); public slots: diff --git a/LibServer/serverlmswidget.cpp b/LibServer/serverlmswidget.cpp index e97900f..2790b4e 100644 --- a/LibServer/serverlmswidget.cpp +++ b/LibServer/serverlmswidget.cpp @@ -191,17 +191,21 @@ void ServerLMSWidget::start() startInitialization_step0(); } -void ServerLMSWidget::slot_BlockAutorizationIndicate(bool block, QString whoFullName, QString type) +void ServerLMSWidget::slot_BlockAutorizationIndicate(bool block, QString blocker, QString types) { if(block) { //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 { //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(); } diff --git a/LibServer/serverlmswidget.h b/LibServer/serverlmswidget.h index 3d7c3d5..9e16997 100644 --- a/LibServer/serverlmswidget.h +++ b/LibServer/serverlmswidget.h @@ -91,7 +91,7 @@ signals: public slots: void slot_LanguageChanged(QString language); 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_ErrorPostgreSQL(QString text);