mirror/rtl_433
1
0
Fork 0
mirror of https://github.com/merbanan/rtl_433.git synced 2026-04-21 01:56:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix MQTT reconnect timer (closes #3145)

Browse Source
This commit is contained in:
Christian W. Zuckschwerdt
2025-01-16 11:02:42 +01:00
parent f78fe65807
commit d05debc690
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/output_influx.c
View File

@@ -92,6 +92,9 @@ static void influx_client_event(struct mg_connection *nc, int ev, void *ev_data)
break; // shutting down
}
ctx->conn = NULL;
if (!ctx->timer) {
break; // shutting down
}
// Timer for next connect attempt, sends us MG_EV_TIMER event
mg_set_timer(ctx->timer, mg_time() + ctx->reconnect_delay);
if (ctx->reconnect_delay < 60) {
@@ -99,6 +102,16 @@ static void influx_client_event(struct mg_connection *nc, int ev, void *ev_data)
ctx->reconnect_delay = (ctx->reconnect_delay + 1) * 3 / 2;
}
break;
}
}
static void influx_client_timer(struct mg_connection *nc, int ev, void *ev_data)
{
// note that while shutting down the ctx is NULL
influx_client_t *ctx = (influx_client_t *)nc->user_data;
(void)ev_data;
switch (ev) {
case MG_EV_TIMER: {
// Try to reconnect, ends if no data to send
influx_client_send(ctx);
@@ -536,7 +549,7 @@ struct data_output *data_output_influx_create(struct mg_mgr *mgr, char *opts)
// add dummy socket to receive timer events
struct mg_add_sock_opts timer_opts = {.user_data = influx};
influx->timer = mg_add_sock_opt(mgr, INVALID_SOCKET, influx_client_event, timer_opts);
influx->timer = mg_add_sock_opt(mgr, INVALID_SOCKET, influx_client_timer, timer_opts);
influx_client_init(influx, url, token);

18
src/output_mqtt.c
View File

@@ -95,6 +95,9 @@ static void mqtt_client_event(struct mg_connection *nc, int ev, void *ev_data)
break; // shutting down
}
ctx->conn = NULL;
if (!ctx->timer) {
break; // shutting down
}
if (ctx->prev_status == 0) {
print_log(LOG_WARNING, "MQTT", "MQTT Connection lost, reconnecting...");
}
@@ -105,6 +108,19 @@ static void mqtt_client_event(struct mg_connection *nc, int ev, void *ev_data)
ctx->reconnect_delay = (ctx->reconnect_delay + 1) * 3 / 2;
}
break;
}
}
static void mqtt_client_timer(struct mg_connection *nc, int ev, void *ev_data)
{
// note that while shutting down the ctx is NULL
mqtt_client_t *ctx = (mqtt_client_t *)nc->user_data;
(void)ev_data;
//if (ev != MG_EV_POLL)
// fprintf(stderr, "MQTT timer handler got event %d\n", ev);
switch (ev) {
case MG_EV_TIMER: {
// Try to reconnect
char const *error_string = NULL;
@@ -174,7 +190,7 @@ static mqtt_client_t *mqtt_client_init(struct mg_mgr *mgr, tls_opts_t *tls_opts,
// add dummy socket to receive timer events
struct mg_add_sock_opts opts = {.user_data = ctx};
ctx->timer = mg_add_sock_opt(mgr, INVALID_SOCKET, mqtt_client_event, opts);
ctx->timer = mg_add_sock_opt(mgr, INVALID_SOCKET, mqtt_client_timer, opts);
char const *error_string = NULL;
ctx->connect_opts.error_string = &error_string;