diff --git a/plugins/mqtt/mqtt_config.c b/plugins/mqtt/mqtt_config.c index a7bcb1d4..9389d0e8 100644 --- a/plugins/mqtt/mqtt_config.c +++ b/plugins/mqtt/mqtt_config.c @@ -72,12 +72,12 @@ static inline int parse_ssl_params(neu_plugin_t *plugin, const char *setting, // ssl, optional int ret = neu_parse_param(setting, NULL, 1, ssl); if (0 != ret) { - plog_info(plugin, "setting no ssl"); + plog_notice(plugin, "setting no ssl"); return 0; } if (false == ssl->v.val_bool) { - plog_info(plugin, "setting ssl disabled"); + plog_notice(plugin, "setting ssl disabled"); return 0; } @@ -90,7 +90,7 @@ static inline int parse_ssl_params(neu_plugin_t *plugin, const char *setting, // cert, optional ret = neu_parse_param(setting, NULL, 1, cert); if (0 != ret) { - plog_info(plugin, "setting no cert"); + plog_notice(plugin, "setting no cert"); return 0; } @@ -107,7 +107,7 @@ static inline int parse_ssl_params(neu_plugin_t *plugin, const char *setting, // keypass, optional ret = neu_parse_param(setting, NULL, 1, keypass); if (0 != ret) { - plog_info(plugin, "setting no keypass"); + plog_notice(plugin, "setting no keypass"); } else if (0 == strlen(keypass->v.val_str)) { plog_error(plugin, "setting invalid keypass"); return -1; @@ -128,7 +128,7 @@ static int parse_cache_params(neu_plugin_t *plugin, const char *setting, // offline-cache flag, optional ret = neu_parse_param(setting, NULL, 1, offline_cache); if (0 != ret) { - plog_info(plugin, "setting no offline cache flag"); + plog_notice(plugin, "setting no offline cache flag"); flag_present = false; // `offline-cache` not present in setting } @@ -302,13 +302,13 @@ int mqtt_config_parse(neu_plugin_t *plugin, const char *setting, // username, optional ret = neu_parse_param(setting, NULL, 1, &username); if (0 != ret) { - plog_info(plugin, "setting no username"); + plog_notice(plugin, "setting no username"); } // password, optional ret = neu_parse_param(setting, NULL, 1, &password); if (0 != ret) { - plog_info(plugin, "setting no password"); + plog_notice(plugin, "setting no password"); } ret = parse_ssl_params(plugin, setting, &ssl, &ca, &cert, &key, &keypass); @@ -333,36 +333,38 @@ int mqtt_config_parse(neu_plugin_t *plugin, const char *setting, config->key = key.v.val_str; config->keypass = keypass.v.val_str; - plog_info(plugin, "config client-id : %s", config->client_id); - plog_info(plugin, "config qos : %d", config->qos); - plog_info(plugin, "config format : %s", - mqtt_upload_format_str(config->format)); - plog_info(plugin, "config write-req-topic : %s", config->write_req_topic); - plog_info(plugin, "config write-resp-topic: %s", config->write_resp_topic); - plog_info(plugin, "config cache : %zu", config->cache); - plog_info(plugin, "config cache-mem-size : %zu", config->cache_mem_size); - plog_info(plugin, "config cache-disk-size : %zu", config->cache_disk_size); - plog_info(plugin, "config host : %s", config->host); - plog_info(plugin, "config port : %" PRIu16, config->port); + plog_notice(plugin, "config client-id : %s", config->client_id); + plog_notice(plugin, "config qos : %d", config->qos); + plog_notice(plugin, "config format : %s", + mqtt_upload_format_str(config->format)); + plog_notice(plugin, "config write-req-topic : %s", config->write_req_topic); + plog_notice(plugin, "config write-resp-topic: %s", + config->write_resp_topic); + plog_notice(plugin, "config cache : %zu", config->cache); + plog_notice(plugin, "config cache-mem-size : %zu", config->cache_mem_size); + plog_notice(plugin, "config cache-disk-size : %zu", + config->cache_disk_size); + plog_notice(plugin, "config host : %s", config->host); + plog_notice(plugin, "config port : %" PRIu16, config->port); if (config->username) { - plog_info(plugin, "config username : %s", config->username); + plog_notice(plugin, "config username : %s", config->username); } if (config->password) { - plog_info(plugin, "config password : %s", - 0 == strlen(config->password) ? "" : placeholder); + plog_notice(plugin, "config password : %s", + 0 == strlen(config->password) ? "" : placeholder); } if (config->ca) { - plog_info(plugin, "config ca : %s", placeholder); + plog_notice(plugin, "config ca : %s", placeholder); } if (config->cert) { - plog_info(plugin, "config cert : %s", placeholder); + plog_notice(plugin, "config cert : %s", placeholder); } if (config->key) { - plog_info(plugin, "config key : %s", placeholder); + plog_notice(plugin, "config key : %s", placeholder); } if (config->keypass) { - plog_info(plugin, "config keypass : %s", placeholder); + plog_notice(plugin, "config keypass : %s", placeholder); } return 0; diff --git a/plugins/mqtt/mqtt_handle.c b/plugins/mqtt/mqtt_handle.c index 40872d32..b248ab6a 100644 --- a/plugins/mqtt/mqtt_handle.c +++ b/plugins/mqtt/mqtt_handle.c @@ -194,8 +194,8 @@ static char *generate_write_resp_json(neu_plugin_t * plugin, static inline int send_read_req(neu_plugin_t *plugin, neu_json_mqtt_t *mqtt, neu_json_read_req_t *req) { - plog_info(plugin, "read uuid:%s, group:%s, node:%s", mqtt->uuid, req->group, - req->node); + plog_notice(plugin, "read uuid:%s, group:%s, node:%s", mqtt->uuid, + req->group, req->node); neu_reqresp_head_t header = { 0 }; header.ctx = mqtt; @@ -214,8 +214,8 @@ static inline int send_read_req(neu_plugin_t *plugin, neu_json_mqtt_t *mqtt, static int send_write_req(neu_plugin_t *plugin, neu_json_mqtt_t *mqtt, neu_json_write_req_t *req) { - plog_info(plugin, "write uuid:%s, group:%s, node:%s", mqtt->uuid, - req->group, req->node); + plog_notice(plugin, "write uuid:%s, group:%s, node:%s", mqtt->uuid, + req->group, req->node); neu_reqresp_head_t header = { 0 }; neu_req_write_tag_t cmd = { 0 }; @@ -538,8 +538,8 @@ int handle_subscribe_group(neu_plugin_t *plugin, neu_req_subscribe_t *sub_info) goto end; } - plog_info(plugin, "route driver:%s group:%s to topic:%s", sub_info->driver, - sub_info->group, topic.v.val_str); + plog_notice(plugin, "route driver:%s group:%s to topic:%s", + sub_info->driver, sub_info->group, topic.v.val_str); end: free(sub_info->params); @@ -550,7 +550,7 @@ int handle_unsubscribe_group(neu_plugin_t * plugin, neu_req_unsubscribe_t *unsub_info) { route_tbl_del(&plugin->route_tbl, unsub_info->driver, unsub_info->group); - plog_info(plugin, "del route driver:%s group:%s", unsub_info->driver, - unsub_info->group); + plog_notice(plugin, "del route driver:%s group:%s", unsub_info->driver, + unsub_info->group); return 0; } diff --git a/plugins/mqtt/mqtt_plugin.c b/plugins/mqtt/mqtt_plugin.c index 910bca39..b3c2f083 100644 --- a/plugins/mqtt/mqtt_plugin.c +++ b/plugins/mqtt/mqtt_plugin.c @@ -30,15 +30,15 @@ static void connect_cb(void *data) { neu_plugin_t *plugin = data; plugin->common.link_state = NEU_NODE_LINK_STATE_CONNECTED; - plog_info(plugin, "plugin `%s` connected", neu_plugin_module.module_name); + plog_notice(plugin, "plugin `%s` connected", neu_plugin_module.module_name); } static void disconnect_cb(void *data) { neu_plugin_t *plugin = data; plugin->common.link_state = NEU_NODE_LINK_STATE_DISCONNECTED; - plog_info(plugin, "plugin `%s` disconnected", - neu_plugin_module.module_name); + plog_notice(plugin, "plugin `%s` disconnected", + neu_plugin_module.module_name); } static neu_plugin_t *mqtt_plugin_open(void) @@ -51,7 +51,7 @@ static neu_plugin_t *mqtt_plugin_open(void) static int mqtt_plugin_close(neu_plugin_t *plugin) { const char *name = neu_plugin_module.module_name; - plog_info(plugin, "success to free plugin:%s", name); + plog_notice(plugin, "success to free plugin:%s", name); free(plugin); return NEU_ERR_SUCCESS; @@ -59,8 +59,8 @@ static int mqtt_plugin_close(neu_plugin_t *plugin) static int mqtt_plugin_init(neu_plugin_t *plugin) { - plog_info(plugin, "initialize plugin `%s` success", - neu_plugin_module.module_name); + plog_notice(plugin, "initialize plugin `%s` success", + neu_plugin_module.module_name); neu_adapter_register_metric_cb_t register_metric = plugin->common.adapter_callbacks->register_metric; register_metric(plugin->common.adapter, NEU_METRIC_CACHED_MSGS_NUM, @@ -85,8 +85,8 @@ static int mqtt_plugin_uninit(neu_plugin_t *plugin) route_tbl_free(plugin->route_tbl); - plog_info(plugin, "uninitialize plugin `%s` success", - neu_plugin_module.module_name); + plog_notice(plugin, "uninitialize plugin `%s` success", + neu_plugin_module.module_name); return NEU_ERR_SUCCESS; } @@ -269,11 +269,11 @@ static int mqtt_plugin_config(neu_plugin_t *plugin, const char *setting) } memmove(&plugin->config, &config, sizeof(config)); - plog_info(plugin, "config plugin `%s` success", plugin_name); + plog_notice(plugin, "config plugin `%s` success", plugin_name); return 0; error: - plog_info(plugin, "config plugin `%s` fail", plugin_name); + plog_error(plugin, "config plugin `%s` fail", plugin_name); mqtt_config_fini(&config); return rv; } @@ -299,7 +299,7 @@ static int mqtt_plugin_start(neu_plugin_t *plugin) end: if (0 == rv) { - plog_info(plugin, "start plugin `%s` success", plugin_name); + plog_notice(plugin, "start plugin `%s` success", plugin_name); } else { plog_error(plugin, "start plugin `%s` failed, error %d", plugin_name, rv); @@ -313,11 +313,11 @@ static int mqtt_plugin_stop(neu_plugin_t *plugin) if (plugin->client) { unsubscribe(plugin, &plugin->config); neu_mqtt_client_close(plugin->client); - plog_info(plugin, "mqtt client closed"); + plog_notice(plugin, "mqtt client closed"); } - plog_info(plugin, "stop plugin `%s` success", - neu_plugin_module.module_name); + plog_notice(plugin, "stop plugin `%s` success", + neu_plugin_module.module_name); return NEU_ERR_SUCCESS; } diff --git a/src/connection/mqtt_client.c b/src/connection/mqtt_client.c index b4921cba..754d2ea1 100644 --- a/src/connection/mqtt_client.c +++ b/src/connection/mqtt_client.c @@ -287,14 +287,14 @@ static void task_handle_sub(task_t *task, neu_mqtt_client_t *client) } rc = nng_mqtt_msg_get_suback_return_codes(msg, &n); - log(info, "recv SUBACK return_code:%d", *rc); + log(debug, "recv SUBACK return_code:%d", *rc); rv = 0x80 == *rc ? -1 : 0; task->sub->ack = true; client->suback_count += 1; end: // TODO: handle retry subscribe on failure - log(info, "sub [%s, QoS%d], %s", task->sub->topic, task->sub->qos, + log(notice, "sub [%s, QoS%d], %s", task->sub->topic, task->sub->qos, (0 == rv) ? "OK" : "FAIL"); nng_msg_free(msg); return; @@ -326,10 +326,10 @@ static void task_handle_unsub(task_t *task, neu_mqtt_client_t *client) end: if (task->sub) { - log(info, "unsub [%s, QoS%d], %s", task->sub->topic, task->sub->qos, + log(notice, "unsub [%s, QoS%d], %s", task->sub->topic, task->sub->qos, (0 == rv) ? "OK" : "FAIL"); } else { - log(info, "unsub %s", (0 == rv) ? "OK" : "FAIL"); + log(notice, "unsub %s", (0 == rv) ? "OK" : "FAIL"); } nng_msg_free(msg); return; @@ -431,7 +431,7 @@ static void connect_cb(nng_pipe p, nng_pipe_ev ev, void *arg) neu_mqtt_client_connection_cb_t cb = NULL; void * data = NULL; - log(info, "mqtt client connected"); + log(notice, "mqtt client connected"); nng_mtx_lock(client->mtx); // start receiving @@ -457,7 +457,7 @@ static void disconnect_cb(nng_pipe p, nng_pipe_ev ev, void *arg) neu_mqtt_client_connection_cb_t cb = NULL; void * data = NULL; - log(info, "mqtt client disconnected"); + log(notice, "mqtt client disconnected"); nng_mtx_lock(client->mtx); client->connected = false; cb = client->disconnect_cb; @@ -511,7 +511,7 @@ static void recv_cb(void *arg) uint8_t qos = nng_mqtt_msg_get_publish_qos(msg); (void) payload; - log(info, "recv [%.*s, QoS%d] %" PRIu32 " bytes", (unsigned) topic_len, + log(debug, "recv [%.*s, QoS%d] %" PRIu32 " bytes", (unsigned) topic_len, topic, (int) qos, payload_len); // find matching subscription @@ -565,7 +565,7 @@ static inline task_t *client_alloc_task(neu_mqtt_client_t *client) // the task queue length should be a small number due to reuse // log info every time the task queue length increments by 32 if (0 == (client->task_count & (32 - 1))) { - log(info, "task queue length: %zu", client->task_count); + log(debug, "task queue length: %zu", client->task_count); } return task; @@ -1017,7 +1017,7 @@ int neu_mqtt_client_set_tls(neu_mqtt_client_t *client, const char *ca, if (NULL == ca) { // disable tls - log(info, "tls disabled"); + log(debug, "tls disabled"); if (client->tls_cfg) { nng_tls_config_free(client->tls_cfg); client->tls_cfg = NULL; @@ -1077,7 +1077,7 @@ int neu_mqtt_client_set_cache_size(neu_mqtt_client_t *client, if (0 == mem_size_bytes && 0 == db_size_bytes) { // disable cache - log(info, "cache disabled"); + log(debug, "cache disabled"); if (client->sqlite_cfg) { nng_mqtt_free_sqlite_opt(client->sqlite_cfg); client->sqlite_cfg = NULL;