tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tokio 1.0: use ReceiverStream from tokio-stream

Browse Source 
to wrap a Receiver in a Stream. this will likely move back into tokio
proper once we have a std Stream..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2021-01-11 09:50:04 +01:00
parent 585e90c0de
commit 7c66701366
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/proxmox-backup-client.rs
View File

@ -12,6 +12,7 @@ use futures::future::FutureExt;
use futures::stream::{StreamExt, TryStreamExt};
use serde_json::{json, Value};
use tokio::sync::mpsc;
use tokio_stream::wrappers::ReceiverStream;
use xdg::BaseDirectories;
use pathpatterns::{MatchEntry, MatchType, PatternFlag};
@ -306,7 +307,7 @@ async fn backup_directory<P: AsRef<Path>>(
let (mut tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks
let stream = rx
let stream = ReceiverStream::new(rx)
.map_err(Error::from);
// spawn chunker inside a separate task so that it can run parallel

3
src/bin/proxmox-backup-proxy.rs
View File

@ -6,6 +6,7 @@ use anyhow::{bail, format_err, Error};
use futures::*;
use hyper;
use openssl::ssl::{SslMethod, SslAcceptor, SslFiletype};
use tokio_stream::wrappers::ReceiverStream;
use proxmox::try_block;
use proxmox::api::RpcEnvironmentType;
@ -122,7 +123,7 @@ async fn run() -> Result<(), Error> {
|listener, ready| {
let connections = accept_connections(listener, acceptor, debug);
let connections = hyper::server::accept::from_stream(connections);
let connections = hyper::server::accept::from_stream(ReceiverStream::new(connections));
Ok(ready
.and_then(|_| hyper::Server::builder(connections)