Skip to content

Commit ecafc5c

Browse files
committed
* MDF [mqtt_qos_db] same change on sqlite_conf in sqlite_db_init/finit
Signed-off-by: Jaylin <jaylin@emqx.io>
1 parent 8aa5e0f commit ecafc5c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/supplemental/mqtt/mqtt_qos_db.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,22 +1481,22 @@ void
14811481
nni_mqtt_sqlite_db_init(nng_mqtt_sqlite_option *opt, const char *db_name)
14821482
{
14831483
if (opt != NULL && opt->bridge != NULL &&
1484-
opt->bridge->sqlite->enable) {
1484+
opt->sqlite_conf->enable) {
14851485
nni_lmq_init(&opt->offline_cache,
1486-
opt->bridge->sqlite->flush_mem_threshold);
1486+
opt->sqlite_conf->flush_mem_threshold);
14871487
opt->db_name = nni_strdup(db_name);
14881488
nni_mqtt_qos_db_init((sqlite3 **)&opt->db,
1489-
opt->bridge->sqlite->mounted_file_path, db_name, false);
1490-
nni_mqtt_qos_db_set_client_info(opt->db, opt->bridge->name,
1491-
NULL, "MQTT", opt->bridge->proto_ver);
1489+
opt->sqlite_conf->mounted_file_path, db_name, false);
1490+
nni_mqtt_qos_db_set_client_info(opt->db, opt->bridge_name,
1491+
NULL, "MQTT", opt->proto_ver);
14921492
}
14931493
}
14941494

14951495
void
14961496
nni_mqtt_sqlite_db_fini(nni_mqtt_sqlite_option *sqlite_opt)
14971497
{
1498-
if (sqlite_opt != NULL && sqlite_opt->bridge != NULL &&
1499-
sqlite_opt->bridge->sqlite->enable) {
1498+
if (sqlite_opt != NULL &&
1499+
sqlite_opt->sqlite_conf->enable) {
15001500
nni_lmq_fini(&sqlite_opt->offline_cache);
15011501
nni_strfree(sqlite_opt->db_name);
15021502
nni_mqtt_qos_db_close(sqlite_opt->db);

src/supplemental/mqtt/mqtt_qos_db.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ struct nng_mqtt_sqlite_option {
7373
#if defined(NNG_HAVE_MQTT_BROKER)
7474
char *bridge_name; // copy bridge name here for safety
7575
conf_bridge_node *bridge;
76-
conf_sqlite *sqlite_conf;
7776
#else
7877
void *bridge;
7978
#endif
8079
uint8_t proto_ver;
8180
char *db_name;
8281
nni_lmq offline_cache;
8382
#if defined(NNG_SUPP_SQLITE)
84-
sqlite3 *db;
83+
sqlite3 *db;
84+
conf_sqlite *sqlite_conf;
8585
#else
8686
void *db;
8787
#endif

0 commit comments

Comments
 (0)