matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-09 04:22:45 +03:00
Code Activity

WIP: bump OTEL

Browse Source
This commit is contained in:
Quentin Gliech
2022-09-15 16:14:01 +02:00
parent dc4b66a96c
commit 7dd84a6584
6 changed files with 283 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cli/src/commands/server.rs
View File

@@ -20,7 +20,7 @@ use std::{
use anyhow::Context;
use clap::Parser;
use futures::stream::{StreamExt, TryStreamExt};
use futures_util::stream::{StreamExt, TryStreamExt};
use hyper::Server;
use mas_config::RootConfig;
use mas_email::Mailer;
@@ -100,7 +100,7 @@ async fn watch_templates(
.await?;
// Create a stream out of that subscription
let stream = futures::stream::try_unfold(subscription, |mut sub| async move {
let stream = futures_util::stream::try_unfold(subscription, |mut sub| async move {
let next = sub.next().await?;
anyhow::Ok(Some((next, sub)))
});
@@ -109,7 +109,7 @@ async fn watch_templates(
}
let files_changed_stream =
futures::stream::select_all(streams).try_filter_map(|event| async move {
futures_util::stream::select_all(streams).try_filter_map(|event| async move {
match event {
SubscriptionData::FilesChanged(QueryResult {
files: Some(files), ..