GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-17 04:40:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(monitor): update log level

Browse Source
This commit is contained in:
eeff
2023-05-17 16:57:43 +08:00
parent 07aecc7d7b
commit 4c0a5477e3
3 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/monitor/metric_handle.c
+4 -4
View File
@@ -109,8 +109,8 @@ static int response(nng_aio *aio, char *content, enum nng_http_status status)
nng_http_res_set_status(res, status);
nng_http_req *nng_req = nng_aio_get_input(aio, 0);
nlog_notice("%s %s [%d]", nng_http_req_get_method(nng_req),
nng_http_req_get_uri(nng_req), status);
nlog_info("%s %s [%d]", nng_http_req_get_method(nng_req),
nng_http_req_get_uri(nng_req), status);
nng_aio_set_output(aio, 0, res);
nng_aio_finish(aio, 0);
@@ -282,8 +282,8 @@ void handle_get_metric(nng_aio *aio)
const char *cat_param = neu_http_get_param(aio, "category", &cat_param_len);
if (NULL != cat_param &&
!parse_metrics_catgory(cat_param, cat_param_len, &cat)) {
plog_info(plugin, "invalid metrics category: %.*s", (int) cat_param_len,
cat_param);
plog_error(plugin, "invalid metrics category: %.*s",
(int) cat_param_len, cat_param);
status = NNG_HTTP_STATUS_BAD_REQUEST;
goto end;
}
plugins/monitor/monitor.c
+17 -16
View File
@@ -37,15 +37,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 nng_http_server *server_init()
@@ -54,7 +54,7 @@ static nng_http_server *server_init()
nng_http_server *server = NULL;
const char * host_port = "http://0.0.0.0:7000";
nlog_info("monitor bind url: %s", host_port);
nlog_notice("monitor bind url: %s", host_port);
int ret = nng_url_parse(&url, host_port);
if (0 != ret) {
@@ -178,7 +178,7 @@ static inline void stop_heartbeart_timer(neu_plugin_t *plugin)
if (plugin->heartbeat_timer) {
neu_event_del_timer(plugin->events, plugin->heartbeat_timer);
plugin->heartbeat_timer = NULL;
plog_info(plugin, "heartbeat timer stopped");
plog_notice(plugin, "heartbeat timer stopped");
}
}
@@ -218,7 +218,7 @@ end:
}
plugin->heartbeat_timer = timer;
plog_info(plugin, "start_hearbeat_timer interval: %" PRIu64, interval);
plog_notice(plugin, "start_hearbeat_timer interval: %" PRIu64, interval);
return 0;
}
@@ -285,8 +285,8 @@ static int monitor_plugin_close(neu_plugin_t *plugin)
nng_http_server_stop(plugin->api_server);
nng_http_server_release(plugin->api_server);
pthread_mutex_destroy(&plugin->mutex);
plog_info(plugin, "Success to free plugin: %s",
neu_plugin_module.module_name);
plog_notice(plugin, "Success to free plugin: %s",
neu_plugin_module.module_name);
free(plugin);
return rv;
@@ -297,7 +297,7 @@ static int monitor_plugin_init(neu_plugin_t *plugin)
int rv = 0;
(void) plugin;
plog_info(plugin, "Initialize plugin: %s", neu_plugin_module.module_name);
plog_notice(plugin, "Initialize plugin: %s", neu_plugin_module.module_name);
return rv;
}
@@ -307,7 +307,8 @@ static int monitor_plugin_uninit(neu_plugin_t *plugin)
uninit_timers_and_mqtt(plugin);
plog_info(plugin, "Uninitialize plugin: %s", neu_plugin_module.module_name);
plog_notice(plugin, "Uninitialize plugin: %s",
neu_plugin_module.module_name);
return rv;
}
@@ -371,7 +372,7 @@ static int monitor_plugin_config(neu_plugin_t *plugin, const char *setting)
memmove(plugin->config, &config, sizeof(config));
// `config` moved, do not call monitor_config_fini
plog_info(plugin, "config plugin `%s` success", plugin_name);
plog_notice(plugin, "config plugin `%s` success", plugin_name);
return 0;
error:
@@ -422,7 +423,7 @@ static int monitor_plugin_start(neu_plugin_t *plugin)
const char *plugin_name = neu_plugin_module.module_name;
if (NULL == plugin->mqtt_client) {
plog_info(plugin, "mqtt client is NULL");
plog_notice(plugin, "mqtt client is NULL");
goto end;
}
@@ -442,7 +443,7 @@ static int monitor_plugin_start(neu_plugin_t *plugin)
end:
if (0 == rv) {
plugin->started = true;
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);
@@ -455,13 +456,13 @@ static int monitor_plugin_stop(neu_plugin_t *plugin)
{
if (plugin->mqtt_client) {
neu_mqtt_client_close(plugin->mqtt_client);
plog_info(plugin, "mqtt client closed");
plog_notice(plugin, "mqtt client closed");
}
stop_heartbeart_timer(plugin);
plugin->started = false;
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 0;
}
plugins/monitor/monitor_config.c
+42 -36
View File
@@ -75,19 +75,19 @@ 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;
}
// ca, optional
ret = neu_parse_param(setting, NULL, 1, ca);
if (0 != ret) {
plog_info(plugin, "setting no ca");
plog_notice(plugin, "setting no ca");
return 0;
}
@@ -98,7 +98,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;
}
@@ -115,7 +115,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;
@@ -285,13 +285,13 @@ int monitor_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);
@@ -319,50 +319,56 @@ int monitor_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 event-topic-prefix: %s",
config->event_topic_prefix);
plog_info(plugin, "config heartbeat-interval: %" PRIu64,
config->heartbeat_interval);
plog_info(plugin, "config heartbeat-topic : %s", config->heartbeat_topic);
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 event-topic-prefix: %s",
config->event_topic_prefix);
plog_notice(plugin, "config heartbeat-interval: %" PRIu64,
config->heartbeat_interval);
plog_notice(plugin, "config heartbeat-topic : %s",
config->heartbeat_topic);
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);
}
plog_info(plugin, "config ssl : %d", config->ssl);
plog_notice(plugin, "config ssl : %d", config->ssl);
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);
}
plog_info(plugin, "node add event topic : %s", config->node_add_topic);
plog_info(plugin, "node del event topic : %s", config->node_del_topic);
plog_info(plugin, "node ctl event topic : %s", config->node_ctl_topic);
plog_info(plugin, "node setting event topic : %s",
config->node_setting_topic);
plog_info(plugin, "group add topic : %s", config->group_add_topic);
plog_info(plugin, "group del topic : %s", config->group_del_topic);
plog_info(plugin, "group update topic : %s",
config->group_update_topic);
plog_info(plugin, "tag add topic : %s", config->tag_add_topic);
plog_info(plugin, "tag del topic : %s", config->tag_del_topic);
plog_info(plugin, "tag update topic : %s",
config->tag_update_topic);
plog_notice(plugin, "node add event topic : %s",
config->node_add_topic);
plog_notice(plugin, "node del event topic : %s",
config->node_del_topic);
plog_notice(plugin, "node ctl event topic : %s",
config->node_ctl_topic);
plog_notice(plugin, "node setting event topic : %s",
config->node_setting_topic);
plog_notice(plugin, "group add topic : %s",
config->group_add_topic);
plog_notice(plugin, "group del topic : %s",
config->group_del_topic);
plog_notice(plugin, "group update topic : %s",
config->group_update_topic);
plog_notice(plugin, "tag add topic : %s", config->tag_add_topic);
plog_notice(plugin, "tag del topic : %s", config->tag_del_topic);
plog_notice(plugin, "tag update topic : %s",
config->tag_update_topic);
return 0;