Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .cargo/config.toml

This file was deleted.

107 changes: 17 additions & 90 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions demo/pub/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,6 @@ clock action url="http://localhost:4443" *args:

cargo run -p moq-native --example clock -- --url "{{ url }}" --broadcast "clock" {{ args }} {{ action }}

# Connect tokio-console to the publisher (port 6681).
console:
tokio-console http://127.0.0.1:6681

# --- GStreamer ---

# Publish a video using GStreamer to a relay server.
Expand Down
6 changes: 1 addition & 5 deletions demo/relay/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set fallback

# Run a localhost relay server without authentication.
default:
TOKIO_CONSOLE_BIND=127.0.0.1:6680 cargo run --bin moq-relay -- localhost.toml
cargo run --bin moq-relay -- localhost.toml

# Run a cluster of relay servers.
cluster: token
Expand Down Expand Up @@ -87,7 +87,3 @@ token: key
--root demo --publish "" \
> demo-cli.jwt
fi

# Connect tokio-console to the relay server (port 6680).
console:
tokio-console http://127.0.0.1:6680
2 changes: 0 additions & 2 deletions rs/moq-native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ iroh = ["dep:web-transport-iroh", "dep:web-transport-proto"]
jemalloc = ["dep:tikv-jemallocator", "dep:tikv-jemalloc-ctl"]
websocket = ["dep:qmux"]
ring = ["rustls/ring", "rcgen?/ring", "quinn?/rustls-ring"]
tokio-console = ["dep:console-subscriber"]
android-logcat = ["dep:tracing-android"]

[dependencies]
clap = { version = "4", features = ["derive", "env"] }
console-subscriber = { version = "0.5", optional = true }
futures = "0.3"
hex = "0.4"
humantime = "2.3"
Expand Down
3 changes: 0 additions & 3 deletions rs/moq-native/src/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ impl Log {
registry.with(fmt_layer)
};

#[cfg(feature = "tokio-console")]
let registry = registry.with(console_subscriber::spawn());

registry
.try_init()
.map_err(|e| crate::Error::SetSubscriber(std::sync::Arc::new(e)))?;
Expand Down
Loading