makes ACLK-NG the default if available (#11272)
Timotej S committed
Jun 23, 2021 at 15:34 UTC
107bb52b0139701368d9d53370be8504e312b228
1 file changed
+11
-7
aclk/aclk_api.c
+11
-7
@@ -20,24 +20,24 @@ int aclk_disable_single_updates = 0;
20
21
int aclk_stats_enabled;
22
23
-#ifdef ACLK_LEGACY
24
-int aclk_ng = 0;
25
-#else
23
+#ifdef ACLK_NG
24
int aclk_ng = 1;
25
+#else
26
+int aclk_ng = 0;
27
#endif
28
29
#define ACLK_IMPL_KEY_NAME "aclk implementation"
30
31
#ifdef ENABLE_ACLK
32
void *aclk_starter(void *ptr) {
33
- char *aclk_impl_req = config_get(CONFIG_SECTION_CLOUD, ACLK_IMPL_KEY_NAME, "legacy");
33
+ char *aclk_impl_req = config_get(CONFIG_SECTION_CLOUD, ACLK_IMPL_KEY_NAME, "ng");
34
35
if (!strcasecmp(aclk_impl_req, "ng")) {
36
aclk_ng = 1;
37
} else if (!strcasecmp(aclk_impl_req, "legacy")) {
38
aclk_ng = 0;
39
} else {
40
- 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");
40
+ 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");
41
}
42
43
#ifndef ACLK_NG
@@ -55,12 +55,16 @@ void *aclk_starter(void *ptr) {
55
#endif
56
57
#ifdef ACLK_NG
58
- if (aclk_ng)
58
+ if (aclk_ng) {
59
+ info("Starting ACLK-NG");
60
return aclk_main(ptr);
61
+ }
62
#endif
63
#ifdef ACLK_LEGACY
62
- if (!aclk_ng)
64
+ if (!aclk_ng) {
65
+ info("Starting ACLK Legacy");
66
return legacy_aclk_main(ptr);
67
+ }
68
#endif
69
error_report("No ACLK could be started");
70
return NULL;