Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: change log read to spawn blocking #574

Merged
merged 1 commit into from
Jan 12, 2023
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: 1 addition & 1 deletion runtime/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Both the legacy and next examples can be run using the local client:

``` bash
cd path/to/example
cargo run --manifest ../../../Cargo.toml --bin cargo-shuttle -- run
cargo run --manifest-path ../../../Cargo.toml --bin cargo-shuttle -- run
```

When a more fine controlled testing is needed, use the instructions below.
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/axum/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,14 @@ impl Router {
.data_mut()
.insert_file(BODY_READ_FD, Box::new(body_read_client), FileCaps::all());

tokio::task::spawn(async move {
tokio::task::spawn_blocking(move || {
let mut iter = logs_stream.bytes().filter_map(Result::ok);

while let Some(log) = Log::from_bytes(&mut iter) {
let mut log: runtime::LogItem = log.into();
log.id = deployment_id.clone();

logs_tx.send(Ok(log)).await.unwrap();
logs_tx.blocking_send(Ok(log)).unwrap();
oddgrd marked this conversation as resolved.
Show resolved Hide resolved
}
});

Expand Down