diff --git a/.clangd b/.clangd index cd9c5e1db..c19cd29c9 100644 --- a/.clangd +++ b/.clangd @@ -7,3 +7,4 @@ CompileFlags: - "-I./ext" - "-I./ext/prometheus-cpp-lite-1.0/core/include" - "-I./ext/prometheus-cpp-lite-1.0/simpleapi/include" + - "-I./ext/opentelemetry-cpp-1.21.0/api/include/" diff --git a/service/OneService.cpp b/service/OneService.cpp index 7cf8921e2..41aa33838 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -2851,13 +2851,14 @@ class OneServiceImpl : public OneService { std::string linkSelectMethodStr; if (customPolicy.contains("linkSelectMethod")) { linkSelectMethodStr = OSUtils::jsonString(customPolicy["linkSelectMethod"], "always"); - } else { + } + else { linkSelectMethodStr = OSUtils::jsonString(customPolicy["activeReselect"], "always"); if (customPolicy.contains("activeReselect")) { fprintf(stderr, "warning: 'activeReselect' is deprecated, please use 'linkSelectMethod' instead in policy '%s'\n", customPolicyStr.c_str()); } } - + if (linkSelectMethodStr == "always") { newTemplateBond->setLinkSelectMethod(ZT_BOND_RESELECTION_POLICY_ALWAYS); }