remove ACLK_NEWARCH_DEVMODE (#12018)
Timotej S committed
Feb 23, 2022 at 19:54 UTC
afdd2594206ea7442b1148be69e72557fa8a1c6f
1 file changed
+2
-8
aclk/aclk.c
+2
-8
@@ -613,12 +613,7 @@ static int aclk_attempt_to_connect(mqtt_wss_client client)
613
.drop_on_publish_fail = 1
614
};
615
616
-#if defined(ENABLE_NEW_CLOUD_PROTOCOL) && defined(ACLK_NEWARCH_DEVMODE)
617
- aclk_use_new_cloud_arch = 1;
618
- info("Switching ACLK to new protobuf protocol. Due to #define ACLK_NEWARCH_DEVMODE.");
619
-#else
616
aclk_use_new_cloud_arch = 0;
621
-#endif
617
618
#ifndef ACLK_DISABLE_CHALLENGE
619
if (aclk_env) {
@@ -638,20 +633,19 @@ static int aclk_attempt_to_connect(mqtt_wss_client client)
633
if (netdata_exit)
634
return 1;
635
641
-#ifndef ACLK_NEWARCH_DEVMODE
636
if (aclk_env->encoding == ACLK_ENC_PROTO) {
637
#ifndef ENABLE_NEW_CLOUD_PROTOCOL
638
error("Cloud requested New Cloud Protocol to be used but this agent cannot support it!");
639
continue;
646
-#endif
640
+#else
641
if (!aclk_env_has_capa("proto")) {
642
error ("Can't encoding=proto without at least \"proto\" capability.");
643
continue;
644
}
645
info("Switching ACLK to new protobuf protocol. Due to /env response.");
646
aclk_use_new_cloud_arch = 1;
653
- }
647
#endif
648
+ }
649
650
memset(&auth_url, 0, sizeof(url_t));
651
if (url_parse(aclk_env->auth_endpoint, &auth_url)) {