Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion vicky/src/bin/vicky/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ async fn inner_main() -> Result<()> {
select! {
e = web_task => e.map(|_| ()).context(startup::JoinErr)?,
_ = task_timeout_sweeper => panic!("Task timeout sweeper shouldn't exit"),
_ = scheduler_join_handle => panic!("Scheduler shouldn't exit"),
e = scheduler_join_handle => panic!("Scheduler shouldn't exit. Returned: {:?}", e),
}

Ok(())
Expand Down
6 changes: 4 additions & 2 deletions vicky/src/lib/vicky/scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ impl Scheduler {
tokio::select! {
res = global_events_rx.recv() => {
// wait for changed or new tasks...
if res.is_err() {
return Err(SchedulerError::ChannelClosed.into());
match res {
Ok(_) => {},
Err(tokio::sync::broadcast::error::RecvError::Lagged(_)) => {},
Err(_) => return Err(SchedulerError::ChannelClosed.into()),
}
}
res = fairy_handles_rx.recv() => {
Expand Down
Loading