From 107bb52b0139701368d9d53370be8504e312b228 Mon Sep 17 00:00:00 2001
From: Timotej S <6674623+underhood@users.noreply.github.com>
Date: Wed, 23 Jun 2021 15:34:47 +0200
Subject: makes ACLK-NG the default if available (#11272)

---
 aclk/aclk_api.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/aclk/aclk_api.c b/aclk/aclk_api.c
index 9360ce349a..edbe02be34 100644
--- a/aclk/aclk_api.c
+++ b/aclk/aclk_api.c
@@ -20,24 +20,24 @@ int aclk_disable_single_updates = 0;
 
 int aclk_stats_enabled;
 
-#ifdef ACLK_LEGACY
-int aclk_ng = 0;
-#else
+#ifdef ACLK_NG
 int aclk_ng = 1;
+#else
+int aclk_ng = 0;
 #endif
 
 #define ACLK_IMPL_KEY_NAME "aclk implementation"
 
 #ifdef ENABLE_ACLK
 void *aclk_starter(void *ptr) {
-    char *aclk_impl_req = config_get(CONFIG_SECTION_CLOUD, ACLK_IMPL_KEY_NAME, "legacy");
+    char *aclk_impl_req = config_get(CONFIG_SECTION_CLOUD, ACLK_IMPL_KEY_NAME, "ng");
 
     if (!strcasecmp(aclk_impl_req, "ng")) {
         aclk_ng = 1;
     } else if (!strcasecmp(aclk_impl_req, "legacy")) {
         aclk_ng = 0;
     } else {
-        error("Unknown value \"%s\" of key \"" ACLK_IMPL_KEY_NAME "\" in section \"" CONFIG_SECTION_CLOUD "\". Using ACLK %s.", aclk_impl_req, aclk_ng ? "NG" : "Legacy");
+        error("Unknown value \"%s\" of key \"" ACLK_IMPL_KEY_NAME "\" in section \"" CONFIG_SECTION_CLOUD "\". Trying default ACLK %s.", aclk_impl_req, aclk_ng ? "NG" : "Legacy");
     }
 
 #ifndef ACLK_NG
@@ -55,12 +55,16 @@ void *aclk_starter(void *ptr) {
 #endif
 
 #ifdef ACLK_NG
-    if (aclk_ng)
+    if (aclk_ng) {
+        info("Starting ACLK-NG");
         return aclk_main(ptr);
+    }
 #endif
 #ifdef ACLK_LEGACY
-    if (!aclk_ng)
+    if (!aclk_ng) {
+        info("Starting ACLK Legacy");
         return legacy_aclk_main(ptr);
+    }
 #endif
     error_report("No ACLK could be started");
     return NULL;
-- 
cgit v1.2.3