[FireNET] Fixed disconnected slot in redisconnector class

Author: afrostalin

src/server/UI/mainwindow.cpp

@@ -212,7 +212,7 @@ void MainWindow::on_Input_returnPressed()
 		qWarning() << "***FULL SERVER STATUS***";
 
 		// Main server status
-		qWarning() << "Server version :" << qApp->applicationVersion().toStdString().c_str();
+		qWarning() << "Server version :" << gEnv->m_serverFullName.toStdString().c_str();
 		qWarning() << "Main server (" << gEnv->pSettings->GetVariable("sv_ip").toString().toStdString().c_str() << ":" << gEnv->pSettings->GetVariable("sv_port").toInt() << ") - " << gEnv->m_ServerStatus.m_MainServerStatus.toStdString().c_str();
 		qWarning() << "Clients count :" << gEnv->pServer->GetClientCount() << "/" << gEnv->pServer->GetMaxClientCount();
 		qWarning() << "Maximum active clients count :" << gEnv->m_MaxClientCount;

src/server/Workers/Databases/redisconnector.cpp

@@ -15,12 +15,15 @@
 RedisConnector::RedisConnector(QObject *parent) : QObject(parent),
 	pClient(nullptr)
 {
+	connect(&m_Timer, &QTimer::timeout, this, &RedisConnector::update);
 }
 
 RedisConnector::~RedisConnector()
 {
 	qDebug() << "~RedisConnector";
 
+	m_Timer.stop();
+
 	if (IsConnected())
 		Disconnect();
 
@@ -64,16 +67,14 @@ bool RedisConnector::Connect()
 	}
 
 	qDebug() << "Redis connected";
+	m_Timer.start(1000);
 
 	return true;
 }
 
 bool RedisConnector::IsConnected()
 {
-	if (pClient && pClient->is_connected())
-		return true;
-	else
-		return false;
+	return pClient && pClient->is_connected() ? true : false;
 }
 
 void RedisConnector::Disconnect()
@@ -271,9 +272,15 @@ void RedisConnector::BGSAVE()
 		qWarning() << "Redis not connected";
 }
 
-// TODO - DEPRICATED
+void RedisConnector::update()
+{
+	if (!IsConnected())
+		emit disconnected();
+}
+
 void RedisConnector::disconnected()
 {
 	qCritical() << "Redis server disconnected. Database functions not be work!";
 	gEnv->m_ServerStatus.m_DBStatus = "offline";
+	m_Timer.stop();
 }

src/server/Workers/Databases/redisconnector.h

@@ -5,6 +5,7 @@
 #define REDISCONNECTOR_H
 
 #include <QObject>
+#include <QTimer>
 
 namespace cpp_redis
 {
@@ -30,9 +31,11 @@ class RedisConnector : public QObject
 	QString                                      GET(const QString &key);	
 	void                                         BGSAVE();
 public slots:
-	void                                         disconnected();	
+	void                                         disconnected();
+	void                                         update();
 private:
 	cpp_redis::redis_client*                     pClient;
+	QTimer                                       m_Timer;
 };
 
 #endif // REDISCONNECTOR_H

src/server/main.cpp

@@ -14,8 +14,8 @@ int main(int argc, char *argv[])
 	QApplication* pApp = new QApplication(argc, argv);
 
 	// Server buid version, number and type
-	QString buildVersion = "v.2.1.3";
-	int buildNumber = 94;
+	QString buildVersion = "v.2.1.4";
+	int buildNumber = 2;
 	QString appVersion = buildVersion + "." + QString::number(buildNumber);
 #ifdef QT_NO_DEBUG
 	QString buildType = ". Release profile";