diff options
| author | Timotej S <6674623+underhood@users.noreply.github.com> | 2021-06-23 15:34:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 15:34:47 +0200 |
| commit | 107bb52b0139701368d9d53370be8504e312b228 (patch) | |
| tree | 4048b140bb670e906e3411222c0844c052b9efbc | |
| parent | 0cd6cfe526c9c8637a7502964c253acb72c26445 (diff) | |
makes ACLK-NG the default if available (#11272)
| -rw-r--r-- | aclk/aclk_api.c | 18 |
1 files 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; |