Skip to content

feat: add optional sync timeout #2

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.

Sign up for GitHub

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

Open
f00wl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add optional sync timeout #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ you can provide custom homeservers, too.
It will start with a full-sync of the room state, so depending on the size of
your matrix account(s), this may take a moment.

Optional `timeout` (in seconds) can be added.
## Changelog

**Unreleased**
Expand Down
13 changes: 11 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ struct Args {
#[arg(long, env = "TO_HOMESERVER")]
to_homeserver: Option<OwnedServerName>,

/// Custom timeout for syncing, default is 10 secs
#[arg(long, env = "TIMEOUT")]
timeout: Option<u64>,

/// Custom logging info
#[arg(long, env = "RUST_LOG", default_value = "matrix_migrate=info")]
log: String,
Expand Down Expand Up @@ -85,11 +89,16 @@ async fn main() -> anyhow::Result<()> {

info!("All logged in. Syncing...");

let sync_settings = if let Some(s) = args.timeout {
SyncSettings::default().timeout(Duration::from_secs(s))
} else {
SyncSettings::default()
};
let to_c_stream = to_c.clone();
let to_sync_stream = to_c_stream.sync_stream(SyncSettings::default()).await;
let to_sync_stream = to_c_stream.sync_stream(sync_settings.clone()).await;
pin_mut!(to_sync_stream);

try_join!(from_c.sync_once(SyncSettings::default()), async {
try_join!(from_c.sync_once(sync_settings.clone()), async {
to_sync_stream.next().await.unwrap()
})?;

Expand Down