Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log mqtt failure reason #6

Merged
merged 3 commits into from
Jul 13, 2022
Merged

Log mqtt failure reason #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1da4b89
Log the reason for MQTT server disconnection
GJKrupa Jul 13, 2022
c7bea55
Merge remote-tracking branch 'origin/master' into log-mqtt-failure-re…
GJKrupa Jul 13, 2022
2577b3d
Try to reconnect on MQTT disconnection while waiting for ready
GJKrupa Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 55 additions & 23 deletions src/submitters/mqtt_submitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ MQTTSubmitter::MQTTSubmitter(String location, const char* host, int port) :
port(port),
started(false),
disconnected(false),
failure(false),
pendingAcks(),
client(new AsyncMqttClient())
{
Expand Down Expand Up @@ -40,12 +41,22 @@ void MQTTSubmitter::initialise()

bool MQTTSubmitter::ready()
{
return client->connected();
if (disconnected)
{
logln("MQTT was disconnected, trying to reconnect");
disconnected = false;
client->connect();
return false;
}
else
{
return client->connected();
}
}

bool MQTTSubmitter::failed()
{
return disconnected;
return failure;
}

void MQTTSubmitter::onConnect(bool sessionPresent)
Expand All @@ -56,7 +67,14 @@ void MQTTSubmitter::onConnect(bool sessionPresent)
void MQTTSubmitter::onDisconnect(AsyncMqttClientDisconnectReason reason)
{
logfmt("MQTT is down because %d\n", reason);
disconnected = true;
if (reason == AsyncMqttClientDisconnectReason::TCP_DISCONNECTED)
{
disconnected = true;
}
else
{
failure = true;
}
}

void MQTTSubmitter::onPublishAck(uint16_t packetId)
Expand All @@ -66,30 +84,44 @@ void MQTTSubmitter::onPublishAck(uint16_t packetId)

void MQTTSubmitter::sendReading(String name, double value)
{
String topic = "environment/";
topic.concat(location);
topic.concat("/");
topic.concat(name);

String valueString = String(value);

logfmt("MQTT <- %s = %f\n", topic.c_str(), value);

uint16_t msgId = client->publish(topic.c_str(), 1, true, valueString.c_str(), valueString.length());
pendingAcks.insert(msgId);
if (disconnected)
{
logln("Attempting to send data to disconnected MQTT server");
}
else
{
String topic = "environment/";
topic.concat(location);
topic.concat("/");
topic.concat(name);

String valueString = String(value);

logfmt("MQTT <- %s = %f\n", topic.c_str(), value);

uint16_t msgId = client->publish(topic.c_str(), 1, true, valueString.c_str(), valueString.length());
pendingAcks.insert(msgId);
}
}

void MQTTSubmitter::sendReading(String name, String value)
{
String topic = "environment/";
topic.concat(location);
topic.concat("/");
topic.concat(name);

logfmt("MQTT <- %s = %s\n", topic.c_str(), value.c_str());

uint16_t msgId = client->publish(topic.c_str(), 1, true, value.c_str(), value.length());
pendingAcks.insert(msgId);
if (disconnected)
{
logln("Attempting to send data to disconnected MQTT server");
}
else
{
String topic = "environment/";
topic.concat(location);
topic.concat("/");
topic.concat(name);

logfmt("MQTT <- %s = %s\n", topic.c_str(), value.c_str());

uint16_t msgId = client->publish(topic.c_str(), 1, true, value.c_str(), value.length());
pendingAcks.insert(msgId);
}
}

bool MQTTSubmitter::complete()
Expand Down
1 change: 1 addition & 0 deletions src/submitters/mqtt_submitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class MQTTSubmitter: public ReadingSubmitter {
int port;
bool started;
volatile bool disconnected;
volatile bool failure;
AsyncMqttClient *client;
std::set<uint16_t> pendingAcks;

Expand Down