jfmartel/YULTek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implémentation détection internet

Browse Source
This commit is contained in:
jfmartel
2024-01-13 14:02:37 -05:00
parent 40093d5acf
commit 098863edb9
21 changed files with 1341 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+67 -8
View File
@@ -1,16 +1,19 @@
#include "MQTTClientWrapper.h"
#include "OtarcikCan.h"
#include "CANDevice.h"
#include "defines.h"
CMQTTClientWrapper::CMQTTClientWrapper()
{
connect(&mMQTTClient,&QMqttClient::stateChanged,this,&CMQTTClientWrapper::StateChanged);
connect(&mMQTTClient,&QMqttClient::errorChanged,this,&CMQTTClientWrapper::MQTTClientError);
connect(&mMQTTClient,&QMqttClient::messageSent,this,&CMQTTClientWrapper::MQTTMessageSent);
mMQTTRefreshTimer = new QTimer;
mMQTTRefreshTimer->setSingleShot(true);
connect(mMQTTRefreshTimer,&QTimer::timeout,this,&CMQTTClientWrapper::MQTTSendTimerExpired);
mMQTTReconnectTimer = new QTimer;
mMQTTReconnectTimer->setSingleShot(true);
mMQTTReconnectTimer->setSingleShot(false);
connect(mMQTTReconnectTimer,&QTimer::timeout,this,&CMQTTClientWrapper::MQTTReconnectTimerExpired);
mMQTTQueueFlushTimer = new QTimer;
@@ -25,6 +28,9 @@ CMQTTClientWrapper::CMQTTClientWrapper()
mIsClientConnecting = false;
mCircularBufferStatusText = mBufferingModeText = mUploadTimeText = "";
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
#endif
}
CMQTTClientWrapper::~CMQTTClientWrapper()
@@ -117,17 +123,20 @@ void CMQTTClientWrapper::StateChanged()
{
//Connection attempt failed, just restart the timer...
mMQTTReconnectTimer->start(MQTT_CLIENT_RECONNECT_TIMEOUT);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT déconnecté pendant une reconnexion. ","CMQTTClientWrapper",true,1);
}
else
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT déconnecté.","CMQTTClientWrapper",true,1);
mProgramPtr->SetMQTTConnectionSatusRequest(false);
mMQTTReconnectTimer->start(MQTT_CLIENT_RECONNECT_TIMEOUT);
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
mMQTTQueueFlushTimer->stop();
#endif
if(mDisconnectionIsVoluntary == false)
{
mMessagesQueueMode = MQTT_QUEUE_MSG_MODE; //We're disconnected, queue all the messages.
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Passage en mode buffering des messages MQTT","CMQTTClientWrapper",true,2);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Passage en mode buffering des messages MQTT","CMQTTClientWrapper",true,1);
mBufferingModeText = "Buffering";
UpdateGUIBufferingStatus();
}
@@ -143,12 +152,17 @@ void CMQTTClientWrapper::StateChanged()
if(mMQTTMessagesQueue.isEmpty() == false)
{
mMessagesQueueMode = MQTT_QUEUE_MSG_MODE; //Stay in (or enter) queue mode until we empty the buffer
mMQTTQueueFlushTimer->start();
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("FIFO non vide, passage au mode de vidage de la FIFO","CMQTTClientWrapper",true,2);
mBufferingModeText = "Buffering";
mCircularBufferStatusText = QString("%2/%1 messages (0%3\%)").arg(MQTT_CLIENT_MSG_QUEUE_SIZE).arg(mMQTTMessagesQueue.size()).arg((mMQTTMessagesQueue.size()/MQTT_CLIENT_MSG_QUEUE_SIZE)*100);
UpdateGUIBufferingStatus();
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
mMQTTQueueFlushTimer->start();
#else
SendNextQueueMessage();
#endif
}
else
{
@@ -161,7 +175,7 @@ void CMQTTClientWrapper::StateChanged()
case QMqttClient::Connecting:
{
mIsClientConnecting = true;
qDebug("MQTT client Connecting...");
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT en cours de connexion... ","CMQTTClientWrapper",true,1);
break;
}
}
@@ -205,7 +219,7 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
for(int i = 0; i < MessagesList->size(); i++)
{
qint32 res = mMQTTClient.publish(MessagesList->at(i).mMessageTopic,MessagesList->at(i).mMessagePayload.toLocal8Bit(),0,true);
QString LogMsg = QString("Envoi d'un message MQTT. Topic: %1 Payload: %2").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload);
QString LogMsg = QString("Envoi d'un message MQTT. Topic: %1 Payload: %2 Result: %3").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload).arg(res);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
}
@@ -225,6 +239,7 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
if(mMQTTMessagesQueue.size() >= MQTT_CLIENT_MSG_QUEUE_SIZE)
{
delete mMQTTMessagesQueue.takeFirst();
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("FIFO pleine, retrait du premier message.","CMQTTClientWrapper",true,3);
}
mMQTTMessagesQueue.append(NewMsg);
QString LogMsg = QString("Ajout d'un message MQTT à la FIFO. Topic: %1 Payload: %2 FIFO size: %3").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload).arg(mMQTTMessagesQueue.size());
@@ -246,11 +261,19 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
void CMQTTClientWrapper::MQTTReconnectTimerExpired()
{
if(mMQTTClient.state() == QMqttClient::Connected)
{
mMQTTReconnectTimer->stop(); //Already connected....
return;
}
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Tentative de connexion au serveur MQTT...","CMQTTClientWrapper",true,1);
ConnectToBroker();
}
void CMQTTClientWrapper::MQTTQueueFlushTimerExipred()
{
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
if(mMQTTMessagesQueue.isEmpty()) //Shouldn't happen... but just to be safe
{
mMQTTQueueFlushTimer->stop();
@@ -258,24 +281,60 @@ void CMQTTClientWrapper::MQTTQueueFlushTimerExipred()
return;
}
SendNextQueueMessage();
#endif
}
int CMQTTClientWrapper::SendNextQueueMessage()
{
CMQTTMessage *Msg = mMQTTMessagesQueue.takeFirst();
qint32 res = mMQTTClient.publish(Msg->mMessageTopic,Msg->mMessagePayload.toLocal8Bit(),0,true);
QString LogMsg = QString("Envoi d'un message MQTT provenant du buffer. Topic: %1 Payload: %2 Buffer Size: %3").arg(Msg->mMessageTopic).arg(Msg->mMessagePayload).arg(mMQTTMessagesQueue.size());
QString LogMsg = QString("Envoi d'un message MQTT provenant du buffer. Topic: %1 Payload: %2 FIFO Size: %3").arg(Msg->mMessageTopic).arg(Msg->mMessagePayload).arg(mMQTTMessagesQueue.size());
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
delete Msg; //free memory
if(mMQTTMessagesQueue.isEmpty())
{
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
mMQTTQueueFlushTimer->stop();
#endif
mMessagesQueueMode = MQTT_TRANSMIT_MSG_MODE;
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Tous les messages MQTT de la FIFO ont été envoyés au serveur","CMQTTClientWrapper",true,2);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Tous les messages MQTT de la FIFO ont été envoyés au serveur, passage en mode de transmission normal","CMQTTClientWrapper",true,2);
}
return RET_OK;
}
int CMQTTClientWrapper::UpdateGUIBufferingStatus()
{
//mProgramPtr->UpdateMQTTBufferingStatusRequest(mBufferingModeText,mCircularBufferStatusText,mRemainingBufferingTimeText);
}
void CMQTTClientWrapper::MQTTClientError(QMqttClient::ClientError error)
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Erreur du client MQTT: %1").arg(error),"CMQTTClientWrapper",true,2);
}
//This function is used only when flushing the msg queue
void CMQTTClientWrapper::MQTTMessageSent(qint32 MsgID)
{
#ifndef MQTT_USE_TIMER_TO_FLUSH_QUEUE
if(mMessagesQueueMode != MQTT_QUEUE_MSG_MODE)
{
return;
}
if(mMQTTMessagesQueue.isEmpty()) //Shouldn't happen... but just to be safe
{
mMessagesQueueMode = MQTT_TRANSMIT_MSG_MODE;
return;
}
SendNextQueueMessage();
#endif
}
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h
+5
View File
@@ -36,6 +36,7 @@ public:
int StopMQTTClient();
COtarcikCan *mProgramPtr;
private:
QTimer *mMQTTRefreshTimer;
@@ -50,6 +51,8 @@ private:
bool mIsClientConnecting;
QString mCircularBufferStatusText, mBufferingModeText, mUploadTimeText;
int SendNextQueueMessage();
int UpdateGUIBufferingStatus();
@@ -58,6 +61,8 @@ public slots:
void MQTTSendTimerExpired();
void MQTTReconnectTimerExpired();
void MQTTQueueFlushTimerExipred();
void MQTTClientError(QMqttClient::ClientError error);
void MQTTMessageSent(qint32 MsgID);
};
Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp
+18
View File
@@ -210,3 +210,21 @@ void CGeneralStatusPage::QuitAppBtnPressed()
{
mProgramPtr->QuitApplicationRequest();
}
void CGeneralStatusPage::InternetStatusChanged(bool InternetConnected)
{
if(InternetConnected == true)
{
ui->mInternetPresentStatLbl->setText("Détecté");
QPalette pal = QPalette(ui->mInternetPresentStatLbl->palette());
pal.setColor(QPalette::WindowText,QColor(Qt::darkGreen));
ui->mInternetPresentStatLbl->setPalette(pal);
}
else
{
ui->mInternetPresentStatLbl->setText("Déconnecté");
QPalette pal = QPalette(ui->mInternetPresentStatLbl->palette());
pal.setColor(QPalette::WindowText,QColor(Qt::red));
ui->mInternetPresentStatLbl->setPalette(pal);
}
}
Otarcik_CAN/Sources/Gui/GeneralStatusPage.h
+1
View File
@@ -51,6 +51,7 @@ private:
public slots:
void ClearGenMsgAreaBtnPressed();
void QuitAppBtnPressed();
void InternetStatusChanged(bool InternetConnected);
};
Otarcik_CAN/Sources/InternetMonitor.cpp
+103
View File
@@ -0,0 +1,103 @@
#include "InternetMonitor.h"
#include <QNetworkReply>
#include "defines.h"
#include "GeneralMessagesLogDispatcher.h"
CInternetMonitor::CInternetMonitor(QObject *parent) : QObject(parent)
{
mInternetActive = false;
mNetMgr = new QNetworkAccessManager(this);
connect(mNetMgr,&QNetworkAccessManager::finished,this,&CInternetMonitor::NetworkReqfinished);
mConnectionTimer = new QTimer;
mConnectionTimer->setSingleShot(true);
mConnectionTimer->setInterval(INTERNET_MONITOR_CONNECTION_TIMEOUT);
connect(mConnectionTimer,&QTimer::timeout,this,&CInternetMonitor::ConnectionTimerExpired);
mCheckInternetStateTimer = new QTimer;
mCheckInternetStateTimer->setSingleShot(true);
mCheckInternetStateTimer->setInterval(INTERNET_MONITOR_INET_CHECK_TIMEOUT);
connect(mCheckInternetStateTimer,&QTimer::timeout,this,&CInternetMonitor::CheckInternetTimerExpired);
}
CInternetMonitor::~CInternetMonitor()
{
delete mNetMgr;
delete mCheckInternetStateTimer;
delete mConnectionTimer;
}
bool CInternetMonitor::IsInternetActive()
{
return mInternetActive;
}
int CInternetMonitor::Start()
{
CheckInternet();
return RET_OK;
}
int CInternetMonitor::CheckInternet()
{
if(mConnectionTimer->isActive()) //are we waiting for a reply??
return RET_GENERAL_ERROR;
mNetMgr->get(QNetworkRequest(QUrl("http://google.ca")));
mConnectionTimer->start();
return RET_OK;
}
void CInternetMonitor::NetworkReqfinished(QNetworkReply *reply)
{
mConnectionTimer->stop();
if(reply->error() == QNetworkReply::NoError)
{
// QByteArray Data = reply->readAll();
// qDebug("%s",qPrintable(Data));
if(mInternetActive == false)
{
emit InternetStateChanged(true);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Internet Connecté...","CInternetMonitor");
}
mInternetActive = true;
//qDebug("Internet is active");
}
else
{
if(mInternetActive == true)
{
emit InternetStateChanged(false);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Internet déconnecté...","CInternetMonitor");
}
mInternetActive = false;
}
mCheckInternetStateTimer->start();
reply->close();
reply->deleteLater();
}
void CInternetMonitor::CheckInternetTimerExpired()
{
CheckInternet();
}
void CInternetMonitor::ConnectionTimerExpired()
{
mCheckInternetStateTimer->start();
mConnectionTimer->stop();
if(mInternetActive == true)
{
emit InternetStateChanged(false);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Internet déconnecté...","CInternetMonitor");
}
mInternetActive = false;
}
Otarcik_CAN/Sources/InternetMonitor.h
+37
View File
@@ -0,0 +1,37 @@
#ifndef INTERNETMONITOR_H
#define INTERNETMONITOR_H
#include <QObject>
#include <QNetworkAccessManager>
#include <QTimer>
#define INTERNET_MONITOR_CONNECTION_TIMEOUT 2000
#define INTERNET_MONITOR_INET_CHECK_TIMEOUT 5000
class CInternetMonitor : public QObject
{
Q_OBJECT
public:
explicit CInternetMonitor(QObject *parent = 0);
~CInternetMonitor();
int Start();
bool IsInternetActive();
private:
QNetworkAccessManager *mNetMgr;
bool mInternetActive;
QTimer *mCheckInternetStateTimer, *mConnectionTimer;
int CheckInternet();
signals:
void InternetStateChanged(bool);
public slots:
void NetworkReqfinished(QNetworkReply *reply);
void CheckInternetTimerExpired();
void ConnectionTimerExpired();
};
#endif // INTERNETMONITOR_H
Otarcik_CAN/Sources/OtarcikCan.cpp
+3 -1
View File
@@ -57,7 +57,7 @@ int COtarcikCan::Start()
mMainWindow.show();
mSysLogger.Start("logs4.papertrailapp.com",27817);
mSysLogger.Start("10.8.0.6",514);
CGeneralMessagesLogDispatcher::instance()->BindGuiPageHandle(mMainWindow.mGeneralStatusPage);
CGeneralMessagesLogDispatcher::instance()->Init(&mSysLogger);
@@ -111,6 +111,8 @@ int COtarcikCan::Start()
mCANBusMQTTClient.StartMQTTClient();
mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList);
connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mGeneralStatusPage,&CGeneralStatusPage::InternetStatusChanged);
mInternetMonitor.Start();
return 0;
Otarcik_CAN/Sources/OtarcikCan.h
+2
View File
@@ -11,6 +11,7 @@
#include "MQTTClientWrapper.h"
#include "ComputerBoardInterface.h"
#include "SysLogger.h"
#include "InternetMonitor.h"
class COtarcikCan : public QObject
@@ -26,6 +27,7 @@ public:
CComputerBoardInterface mCPUInterface;
QTimer *mWatchdogTimer;
CSysLogger mSysLogger;
CInternetMonitor mInternetMonitor;
int Start();
Otarcik_CAN/Sources/SysLogger.cpp
+11 -2
View File
@@ -25,6 +25,7 @@ void CSysLogger::SocketStateChanged(QAbstractSocket::SocketState socketState)
{
qDebug("Syslogger connected...");
SysLog("Syslogger connected","CSysLogger");
break;
}
case QAbstractSocket::UnconnectedState:
@@ -53,14 +54,22 @@ int CSysLogger::SysLog(QString Message, QString Module)
if(IsSyslogServerConnected() == false)
return RET_GENERAL_ERROR;
/// timestamp hostname process [Module]:message ///
QString MsgString;
MsgString.clear();
//ISO date timestamp format
QDateTime datetime(QDateTime::currentDateTime());
datetime.setOffsetFromUtc(datetime.offsetFromUtc()); //this makes no sense but it's to circumvent a bug in QT
MsgString = datetime.toString(Qt::ISODate);
MsgString += datetime.toString(Qt::ISODate);
//MsgString += datetime.toString("yyyy-MM-dd_hh:mm:ss ");
MsgString.append(" Station_OT2301 OtarcikCAN");
///Add Hostname, PID, MSGID , STRUCTDATA (-)
MsgString.append(" Station_OT2301 OtarcikCAN ");
if(Module.isEmpty() == false)
{
MsgString.append(QString("[%1]").arg(Module));
Otarcik_CAN/Sources/defines.h
+1 -1
View File
@@ -10,7 +10,7 @@
#define MQTT_CLIENT_MSG_QUEUE_FLUSH_TIMEOUT 500 //The delay in ms between the TX messages when flushing the msg queue after a server reconnection
#define MQTT_CLIENT_MSG_QUEUE_SIZE 500 //The maximum number of messages to be queued. Older messages are lost when adding a new one in a full queue
#define MQTT_TIMESTAMP_IN_PAYLOAD //Defining this adds the local timestamp to each MQTT payloads.
//#define MQTT_USE_TIMER_TO_FLUSH_QUEUE //Use a timer based transmission of MQTT msgs while emtpying the queue instead of the "MessageSent" event.
#define USE_TOPIC_PREFIX
#define FORCE_FLOAT_REPRESENTATION