fix(bin): consider env when no verbosity flag is set #1848
Conversation
There are two ways to specify the maximum log level of `neqo-server` and `neqo-client`. Via the `RUST_LOG` environment variable and since mozilla#1692 via the verbosity flags (e.g. `-v`). Previously, if no verbosity flag was provided, `INFO` was set as the maximum log level, the `RUST_LOG` environment variable was simply ignored. With this commit, if no flag is set, the `RUST_LOG` environment variable is considered, and only then the `env_logger` crate default value (`ERROR`) is used. In other words, the precedence order now is: 1. command line flags (e.g. `-v`) 2. `RUST_LOG` environment variable 3. default `ERROR` level
mxinden
requested review from
KershawChang,
martinthomson and
larseggert
as code owners
|
We can as well set the final default log level to modified neqo-common/src/log.rs
@@ -12,7 +12,7 @@ use std::{
time::{Duration, Instant},
};
-use env_logger::Builder;
+use env_logger::{Builder, Env};
#[macro_export]
macro_rules! do_log {
@@ -58,7 +58,7 @@ pub fn init(level_filter: Option<log::LevelFilter>) {
}
INIT_ONCE.call_once(|| {
- let mut builder = Builder::from_env("RUST_LOG");
+ let mut builder = Builder::from_env(Env::default().default_filter_or("info"));
if let Some(filter) = level_filter {
builder.filter_level(filter);
} |
Benchmark resultsPerformance differences relative to 0a84268.
Client/server transfer resultsTransfer of 134217728 bytes over loopback.
|
@larseggert I moved the |
Might have been changed by mozilla#1848
Might have been changed by #1848
There are two server implementations based on neqo: 1. https://github.com/mozilla/neqo/tree/main/neqo-bin/src/server - http3 and http09 implementation - used for manual testing and QUIC Interop 2. https://searchfox.org/mozilla-central/source/netwerk/test/http3server/src/main.rs - used to test Firefox I assume one was once an exact copy of the other. Both implement their own I/O, event loop, ... Since then, the two implementations diverged significantly. Especially (1) saw a lot of improvements in recent months: - mozilla#1564 - mozilla#1569 - mozilla#1578 - mozilla#1581 - mozilla#1604 - mozilla#1612 - mozilla#1676 - mozilla#1692 - mozilla#1707 - mozilla#1708 - mozilla#1727 - mozilla#1753 - mozilla#1756 - mozilla#1766 - mozilla#1772 - mozilla#1786 - mozilla#1787 - mozilla#1788 - mozilla#1794 - mozilla#1806 - mozilla#1808 - mozilla#1848 - mozilla#1866 At this point, bugs in (2) are hard to fix, see e.g. mozilla#1801. This commit merges (2) into (1), thus removing all duplicate logic and having (2) benefit from all the recent improvements to (1).
There are two server implementations based on neqo: 1. https://github.com/mozilla/neqo/tree/main/neqo-bin/src/server - http3 and http09 implementation - used for manual testing and QUIC Interop 2. https://searchfox.org/mozilla-central/source/netwerk/test/http3server/src/main.rs - used to test Firefox I assume one was once an exact copy of the other. Both implement their own I/O, event loop, ... Since then, the two implementations diverged significantly. Especially (1) saw a lot of improvements in recent months: - mozilla#1564 - mozilla#1569 - mozilla#1578 - mozilla#1581 - mozilla#1604 - mozilla#1612 - mozilla#1676 - mozilla#1692 - mozilla#1707 - mozilla#1708 - mozilla#1727 - mozilla#1753 - mozilla#1756 - mozilla#1766 - mozilla#1772 - mozilla#1786 - mozilla#1787 - mozilla#1788 - mozilla#1794 - mozilla#1806 - mozilla#1808 - mozilla#1848 - mozilla#1866 At this point, bugs in (2) are hard to fix, see e.g. mozilla#1801. This commit merges (2) into (1), thus removing all duplicate logic and having (2) benefit from all the recent improvements to (1).
* refactor(bin): introduce server/http3.rs and server/http09.rs The QUIC Interop Runner requires an http3 and http09 implementation for both client and server. The client code is already structured into an http3 and an http09 implementation since #1727. This commit does the same for the server side, i.e. splits the http3 and http09 implementation into separate Rust modules. * refactor: merge mozilla-central http3 server into neqo-bin There are two server implementations based on neqo: 1. https://github.com/mozilla/neqo/tree/main/neqo-bin/src/server - http3 and http09 implementation - used for manual testing and QUIC Interop 2. https://searchfox.org/mozilla-central/source/netwerk/test/http3server/src/main.rs - used to test Firefox I assume one was once an exact copy of the other. Both implement their own I/O, event loop, ... Since then, the two implementations diverged significantly. Especially (1) saw a lot of improvements in recent months: - #1564 - #1569 - #1578 - #1581 - #1604 - #1612 - #1676 - #1692 - #1707 - #1708 - #1727 - #1753 - #1756 - #1766 - #1772 - #1786 - #1787 - #1788 - #1794 - #1806 - #1808 - #1848 - #1866 At this point, bugs in (2) are hard to fix, see e.g. #1801. This commit merges (2) into (1), thus removing all duplicate logic and having (2) benefit from all the recent improvements to (1). * Move firefox.rs to mozilla-central * Reduce HttpServer trait functions * Extract constructor * Remove unused deps * Remove clap color feature Nice to have. Adds multiple dependencies. Hard to justify for mozilla-central.
There are two ways to specify the maximum log level of
neqo-serverandneqo-client. Via theRUST_LOGenvironment variable and since #1692 via the verbosity flags (e.g.-v).Previously, if no verbosity flag was provided,
INFOwas set as the maximum log level, theRUST_LOGenvironment variable was simply ignored.With this commit, if no flag is set, the
RUST_LOGenvironment variable is considered, and only then theenv_loggercrate default value (ERROR) is used.In other words, the precedence order now is:
-v)RUST_LOGenvironment variableERRORlevelAmong other places, ensures the
RUST_LOG=debugin the QUIC Interop tests isn't ignored.neqo/qns/interop.sh
Line 15 in 4fc4d16