diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-02-15 03:25:26 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-02-15 03:26:11 +0000 |
commit | 412fb90f5888df13fdeafb5705b9ea6eef1a4df1 (patch) | |
tree | a33fe79d3373f32b30ff799e6e15331bd6975f76 /aclk/aclk.c | |
parent | Releasing debian version 1.33.0-1. (diff) | |
download | netdata-412fb90f5888df13fdeafb5705b9ea6eef1a4df1.tar.xz netdata-412fb90f5888df13fdeafb5705b9ea6eef1a4df1.zip |
Merging upstream version 1.33.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'aclk/aclk.c')
-rw-r--r-- | aclk/aclk.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/aclk/aclk.c b/aclk/aclk.c index 936f431b6..c25b7df68 100644 --- a/aclk/aclk.c +++ b/aclk/aclk.c @@ -321,7 +321,11 @@ 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)", + disconnect_req ? "true" : "false", + aclk_kill_link ? "true" : "false"); disconnect_req = 0; + aclk_kill_link = 0; aclk_graceful_disconnect(client); aclk_queue_unlock(); aclk_shared_state.mqtt_shutdown_msg_id = -1; @@ -815,6 +819,16 @@ void *aclk_main(void *ptr) if (aclk_attempt_to_connect(mqttwss_client)) goto exit_full; +#if defined(ENABLE_ACLK) && !defined(ENABLE_NEW_CLOUD_PROTOCOL) + error_report("############################ WARNING ###############################"); + error_report("# Your agent is configured to connect to cloud but has #"); + error_report("# no protobuf protocol support (uses legacy JSON protocol) #"); + error_report("# Legacy protocol will be deprecated soon (planned 1st March 2022) #"); + error_report("# Visit following link for more info and instructions how to solve #"); + error_report("# https://www.netdata.cloud/blog/netdata-clouds-new-architecture #"); + error_report("######################################################################"); +#endif + // warning this assumes the popcorning is relative short (3s) // if that changes call mqtt_wss_service from within // to keep OpenSSL, WSS and MQTT connection alive |