|
@@ -154,7 +154,7 @@ biofailed:
|
|
|
|
|
|
static int wait_till_cloud_enabled()
|
|
|
{
|
|
|
- info("Waiting for Cloud to be enabled");
|
|
|
+ netdata_log_info("Waiting for Cloud to be enabled");
|
|
|
while (!netdata_cloud_enabled) {
|
|
|
sleep_usec(USEC_PER_SEC * 1);
|
|
|
if (!service_running(SERVICE_ACLK))
|
|
@@ -237,7 +237,7 @@ void aclk_mqtt_wss_log_cb(mqtt_wss_log_type_t log_type, const char* str)
|
|
|
error_report("%s", str);
|
|
|
return;
|
|
|
case MQTT_WSS_LOG_INFO:
|
|
|
- info("%s", str);
|
|
|
+ netdata_log_info("%s", str);
|
|
|
return;
|
|
|
case MQTT_WSS_LOG_DEBUG:
|
|
|
debug(D_ACLK, "%s", str);
|
|
@@ -297,7 +297,7 @@ static void puback_callback(uint16_t packet_id)
|
|
|
#endif
|
|
|
|
|
|
if (aclk_shared_state.mqtt_shutdown_msg_id == (int)packet_id) {
|
|
|
- info("Shutdown message has been acknowledged by the cloud. Exiting gracefully");
|
|
|
+ netdata_log_info("Shutdown message has been acknowledged by the cloud. Exiting gracefully");
|
|
|
aclk_shared_state.mqtt_shutdown_msg_rcvd = 1;
|
|
|
}
|
|
|
}
|
|
@@ -335,7 +335,7 @@ static int handle_connection(mqtt_wss_client client)
|
|
|
}
|
|
|
|
|
|
if (disconnect_req || aclk_kill_link) {
|
|
|
- info("Going to restart connection due to disconnect_req=%s (cloud req), aclk_kill_link=%s (reclaim)",
|
|
|
+ netdata_log_info("Going to restart connection due to disconnect_req=%s (cloud req), aclk_kill_link=%s (reclaim)",
|
|
|
disconnect_req ? "true" : "false",
|
|
|
aclk_kill_link ? "true" : "false");
|
|
|
disconnect_req = 0;
|
|
@@ -390,7 +390,7 @@ static inline void mqtt_connected_actions(mqtt_wss_client client)
|
|
|
|
|
|
void aclk_graceful_disconnect(mqtt_wss_client client)
|
|
|
{
|
|
|
- info("Preparing to gracefully shutdown ACLK connection");
|
|
|
+ netdata_log_info("Preparing to gracefully shutdown ACLK connection");
|
|
|
aclk_queue_lock();
|
|
|
aclk_queue_flush();
|
|
|
|
|
@@ -403,17 +403,17 @@ void aclk_graceful_disconnect(mqtt_wss_client client)
|
|
|
break;
|
|
|
}
|
|
|
if (aclk_shared_state.mqtt_shutdown_msg_rcvd) {
|
|
|
- info("MQTT App Layer `disconnect` message sent successfully");
|
|
|
+ netdata_log_info("MQTT App Layer `disconnect` message sent successfully");
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- info("ACLK link is down");
|
|
|
+ netdata_log_info("ACLK link is down");
|
|
|
log_access("ACLK DISCONNECTED");
|
|
|
aclk_stats_upd_online(0);
|
|
|
last_disconnect_time = now_realtime_sec();
|
|
|
aclk_connected = 0;
|
|
|
|
|
|
- info("Attempting to gracefully shutdown the MQTT/WSS connection");
|
|
|
+ netdata_log_info("Attempting to gracefully shutdown the MQTT/WSS connection");
|
|
|
mqtt_wss_disconnect(client, 1000);
|
|
|
}
|
|
|
|
|
@@ -455,7 +455,7 @@ static int aclk_block_till_recon_allowed() {
|
|
|
next_connection_attempt = now_realtime_sec() + (recon_delay / MSEC_PER_SEC);
|
|
|
last_backoff_value = (float)recon_delay / MSEC_PER_SEC;
|
|
|
|
|
|
- info("Wait before attempting to reconnect in %.3f seconds", recon_delay / (float)MSEC_PER_SEC);
|
|
|
+ netdata_log_info("Wait before attempting to reconnect in %.3f seconds", recon_delay / (float)MSEC_PER_SEC);
|
|
|
// we want to wake up from time to time to check netdata_exit
|
|
|
while (recon_delay)
|
|
|
{
|
|
@@ -593,7 +593,7 @@ static int aclk_attempt_to_connect(mqtt_wss_client client)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- info("Attempting connection now");
|
|
|
+ netdata_log_info("Attempting connection now");
|
|
|
memset(&base_url, 0, sizeof(url_t));
|
|
|
if (url_parse(aclk_cloud_base_url, &base_url)) {
|
|
|
aclk_status = ACLK_STATUS_INVALID_CLOUD_URL;
|
|
@@ -680,7 +680,7 @@ static int aclk_attempt_to_connect(mqtt_wss_client client)
|
|
|
error_report("Can't use encoding=proto without at least \"proto\" capability.");
|
|
|
continue;
|
|
|
}
|
|
|
- info("New ACLK protobuf protocol negotiated successfully (/env response).");
|
|
|
+ netdata_log_info("New ACLK protobuf protocol negotiated successfully (/env response).");
|
|
|
|
|
|
memset(&auth_url, 0, sizeof(url_t));
|
|
|
if (url_parse(aclk_env->auth_endpoint, &auth_url)) {
|
|
@@ -750,7 +750,7 @@ static int aclk_attempt_to_connect(mqtt_wss_client client)
|
|
|
|
|
|
if (!ret) {
|
|
|
last_conn_time_mqtt = now_realtime_sec();
|
|
|
- info("ACLK connection successfully established");
|
|
|
+ netdata_log_info("ACLK connection successfully established");
|
|
|
aclk_status = ACLK_STATUS_CONNECTED;
|
|
|
log_access("ACLK CONNECTED");
|
|
|
mqtt_connected_actions(client);
|
|
@@ -798,7 +798,7 @@ void *aclk_main(void *ptr)
|
|
|
netdata_thread_disable_cancelability();
|
|
|
|
|
|
#if defined( DISABLE_CLOUD ) || !defined( ENABLE_ACLK )
|
|
|
- info("Killing ACLK thread -> cloud functionality has been disabled");
|
|
|
+ netdata_log_info("Killing ACLK thread -> cloud functionality has been disabled");
|
|
|
static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
|
|
|
return NULL;
|
|
|
#endif
|
|
@@ -924,7 +924,7 @@ void aclk_host_state_update(RRDHOST *host, int cmd)
|
|
|
rrdhost_aclk_state_unlock(localhost);
|
|
|
create_query->data.bin_payload.topic = ACLK_TOPICID_CREATE_NODE;
|
|
|
create_query->data.bin_payload.msg_name = "CreateNodeInstance";
|
|
|
- info("Registering host=%s, hops=%u", host->machine_guid, host->system_info->hops);
|
|
|
+ netdata_log_info("Registering host=%s, hops=%u", host->machine_guid, host->system_info->hops);
|
|
|
aclk_queue_query(create_query);
|
|
|
return;
|
|
|
}
|
|
@@ -947,7 +947,7 @@ void aclk_host_state_update(RRDHOST *host, int cmd)
|
|
|
query->data.bin_payload.payload = generate_node_instance_connection(&query->data.bin_payload.size, &node_state_update);
|
|
|
rrdhost_aclk_state_unlock(localhost);
|
|
|
|
|
|
- info("Queuing status update for node=%s, live=%d, hops=%u",(char*)node_state_update.node_id, cmd,
|
|
|
+ netdata_log_info("Queuing status update for node=%s, live=%d, hops=%u",(char*)node_state_update.node_id, cmd,
|
|
|
host->system_info->hops);
|
|
|
freez((void*)node_state_update.node_id);
|
|
|
query->data.bin_payload.msg_name = "UpdateNodeInstanceConnection";
|
|
@@ -990,7 +990,7 @@ void aclk_send_node_instances()
|
|
|
node_state_update.claim_id = localhost->aclk_state.claimed_id;
|
|
|
query->data.bin_payload.payload = generate_node_instance_connection(&query->data.bin_payload.size, &node_state_update);
|
|
|
rrdhost_aclk_state_unlock(localhost);
|
|
|
- info("Queuing status update for node=%s, live=%d, hops=%d",(char*)node_state_update.node_id,
|
|
|
+ netdata_log_info("Queuing status update for node=%s, live=%d, hops=%d",(char*)node_state_update.node_id,
|
|
|
list->live,
|
|
|
list->hops);
|
|
|
|
|
@@ -1014,7 +1014,7 @@ void aclk_send_node_instances()
|
|
|
node_instance_creation.claim_id = localhost->aclk_state.claimed_id,
|
|
|
create_query->data.bin_payload.payload = generate_node_instance_creation(&create_query->data.bin_payload.size, &node_instance_creation);
|
|
|
rrdhost_aclk_state_unlock(localhost);
|
|
|
- info("Queuing registration for host=%s, hops=%d",(char*)node_instance_creation.machine_guid,
|
|
|
+ netdata_log_info("Queuing registration for host=%s, hops=%d",(char*)node_instance_creation.machine_guid,
|
|
|
list->hops);
|
|
|
freez((void *)node_instance_creation.machine_guid);
|
|
|
aclk_queue_query(create_query);
|