Sfoglia il codice sorgente

Fix otel includes in .clangd

Adam Ierymenko 1 mese fa
parent
commit
41c4642a21
2 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 1 0
      .clangd
  2. 3 2
      service/OneService.cpp

+ 1 - 0
.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/"

+ 3 - 2
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);
 				}