linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set default `trust_dns` log level to `ERROR` (#2393) 

Since upstream has yet to release a version with PR
bluejekyll/trust-dns#1881, this commit changes the proxy's default log
level to silence warnings from `trust_dns_proto` that are generally
spurious.

See linkerd/linkerd2#10123 for details.
This commit is contained in:
Eliza Weisman 2023-04-24 13:25:25 -07:00 committed by GitHub
parent 9d8607351a
commit 423ffb0af8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -41,5 +41,5 @@ RUN --mount=type=cache,id=target,target=target \
FROM $RUNTIME_IMAGE as runtime FROM $RUNTIME_IMAGE as runtime
WORKDIR /linkerd WORKDIR /linkerd
COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy
ENV LINKERD2_PROXY_LOG=warn,linkerd=info ENV LINKERD2_PROXY_LOG=warn,linkerd=info,trust_dns=error
# Inherits the ENTRYPOINT from the runtime image. # Inherits the ENTRYPOINT from the runtime image.

2
linkerd/tracing/src/lib.rs
View File

@ -26,7 +26,7 @@ const ENV_LOG_LEVEL: &str = "LINKERD2_PROXY_LOG";
const ENV_LOG_FORMAT: &str = "LINKERD2_PROXY_LOG_FORMAT"; const ENV_LOG_FORMAT: &str = "LINKERD2_PROXY_LOG_FORMAT";
const ENV_ACCESS_LOG: &str = "LINKERD2_PROXY_ACCESS_LOG"; const ENV_ACCESS_LOG: &str = "LINKERD2_PROXY_ACCESS_LOG";
const DEFAULT_LOG_LEVEL: &str = "warn,linkerd=info"; const DEFAULT_LOG_LEVEL: &str = "warn,linkerd=info,trust_dns=error";
const DEFAULT_LOG_FORMAT: &str = "PLAIN"; const DEFAULT_LOG_FORMAT: &str = "PLAIN";
#[derive(Debug, Default)] #[derive(Debug, Default)]