Skip to content

Commit 9348511

Browse files
committed
in_mqtt: fix connection handler and other minor fixes
Signed-off-by: Eduardo Silva <[email protected]>
1 parent 9fd4272 commit 9348511

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

plugins/in_mqtt/mqtt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ int in_mqtt_collect(struct flb_config *config, void *in_context)
102102
flb_debug("[mqtt] new TCP connection arrived FD=%i", fd);
103103
conn = mqtt_conn_add(fd, ctx);
104104
if (!conn) {
105-
return 0;
105+
return -1;
106106
}
107-
return -1;
107+
return 0;
108108
}
109109

110110
/* Plugin reference */

plugins/in_mqtt/mqtt_config.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ struct flb_in_mqtt_config *mqtt_config_init(struct mk_rconf *conf)
3131
struct flb_in_mqtt_config *config;
3232

3333
config = malloc(sizeof(struct flb_in_mqtt_config));
34+
memset(config, '\0', sizeof(struct flb_in_mqtt_config));
3435

3536
if (conf) {
3637
section = mk_rconf_section_get(conf, "MQTT");

plugins/in_mqtt/mqtt_conn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct mqtt_conn *mqtt_conn_add(int fd, struct flb_in_mqtt_config *ctx)
7979
/* Set data for the event-loop */
8080
event = &conn->event;
8181
event->fd = fd;
82-
event->type = MK_EVENT_CONNECTION;
82+
event->type = FLB_ENGINE_EV_CUSTOM;
8383
event->mask = MK_EVENT_EMPTY;
8484
event->handler = mqtt_conn_event;
8585
event->status = MK_EVENT_NONE;

plugins/in_mqtt/mqtt_prot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ static int mqtt_handle_publish(struct mqtt_conn *conn)
161161
char buf[4];
162162

163163
/*
164-
* DUP: we skip dplicated messages.
164+
* DUP: we skip duplicated messages.
165165
* QOS: We process this.
166166
* Retain: skipped
167167
*/

0 commit comments

Comments
 (0)