Bump Rocket to current HEAD
This commit is contained in:
parent
1a940b6e05
commit
f4039902d8
4 changed files with 401 additions and 354 deletions
|
@ -698,7 +698,8 @@ pub async fn sync_events_route(
|
|||
if duration.as_secs() > 30 {
|
||||
duration = Duration::from_secs(30);
|
||||
}
|
||||
let mut delay = tokio::time::delay_for(duration);
|
||||
let delay = tokio::time::sleep(duration);
|
||||
tokio::pin!(delay);
|
||||
tokio::select! {
|
||||
_ = &mut delay => {}
|
||||
_ = watcher => {}
|
||||
|
|
|
@ -7,7 +7,6 @@ use ruma::{
|
|||
events::{room::message, EventType},
|
||||
UserId,
|
||||
};
|
||||
use tokio::select;
|
||||
|
||||
pub enum AdminCommand {
|
||||
RegisterAppservice(serde_yaml::Value),
|
||||
|
@ -71,7 +70,7 @@ impl Admin {
|
|||
};
|
||||
|
||||
loop {
|
||||
select! {
|
||||
tokio::select! {
|
||||
Some(event) = receiver.next() => {
|
||||
match event {
|
||||
AdminCommand::RegisterAppservice(yaml) => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue