Roll back tokio and rocket update since ruma's request is at 0.2 tokio
This commit is contained in:
parent
3a6f264450
commit
a897608025
4 changed files with 54 additions and 168 deletions
|
@ -674,8 +674,7 @@ pub async fn sync_events_route(
|
|||
if duration.as_secs() > 30 {
|
||||
duration = Duration::from_secs(30);
|
||||
}
|
||||
let delay = tokio::time::sleep(duration);
|
||||
tokio::pin!(delay);
|
||||
let mut delay = tokio::time::delay_for(duration);
|
||||
tokio::select! {
|
||||
_ = &mut delay => {}
|
||||
_ = watcher => {}
|
||||
|
|
|
@ -28,11 +28,6 @@ fn setup_rocket() -> rocket::Rocket {
|
|||
// Force log level off, so we can use our own logger
|
||||
std::env::set_var("CONDUIT_LOG_LEVEL", "off");
|
||||
|
||||
std::env::set_var(
|
||||
"CONDUIT_CONFIG",
|
||||
"/home/devinr/aprog/rust/__forks__/conduit/conduit.toml",
|
||||
);
|
||||
|
||||
let config =
|
||||
Figment::from(rocket::Config::release_default())
|
||||
.merge(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue