Fix issue with restarting and crashing bot

udoprog · Apr 21, 2020 · c0178f8 · c0178f8
1 parent 075a0c8
commit c0178f8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 46 deletions.
diff --git a/bot/Cargo.toml b/bot/Cargo.toml
@@ -79,4 +79,4 @@ winapi = { version = "0.3.8", features = ["shellapi", "impl-default"] }
 
 [features]
 default = ["windows"]
-windows = []
+windows = []
diff --git a/bot/src/bus.rs b/bot/src/bus.rs
@@ -78,7 +78,7 @@ impl<T> Bus<T> {
             }
         }
 
-        for i in remove {
+        for i in remove.into_iter().rev() {
             inner.subs.swap_remove(i);
         }
     }

diff --git a/bot/src/irc/currency_admin.rs b/bot/src/irc/currency_admin.rs
@@ -166,35 +166,33 @@ impl command::Handler for Handler {
                 let user = ctx.user.clone();
                 let currency = currency.clone();
 
-                ctx.spawn(async move {
-                    let result = currency
-                        .balance_add(user.channel(), &boosted_user, amount)
-                        .await;
+                let result = currency
+                    .balance_add(user.channel(), &boosted_user, amount)
+                    .await;
 
-                    match result {
-                        Ok(()) => {
-                            if amount >= 0 {
-                                user.respond(format!(
-                                    "Gave {user} {amount} {currency}!",
-                                    user = boosted_user,
-                                    amount = amount,
-                                    currency = currency.name
-                                ));
-                            } else {
-                                user.respond(format!(
-                                    "Took away {amount} {currency} from {user}!",
-                                    user = boosted_user,
-                                    amount = -amount,
-                                    currency = currency.name
-                                ));
-                            }
-                        }
-                        Err(e) => {
-                            user.respond("failed to boost user, sorry :(");
-                            log_err!(e, "failed to modify currency");
+                match result {
+                    Ok(()) => {
+                        if amount >= 0 {
+                            user.respond(format!(
+                                "Gave {user} {amount} {currency}!",
+                                user = boosted_user,
+                                amount = amount,
+                                currency = currency.name
+                            ));
+                        } else {
+                            user.respond(format!(
+                                "Took away {amount} {currency} from {user}!",
+                                user = boosted_user,
+                                amount = -amount,
+                                currency = currency.name
+                            ));
                         }
                     }
-                });
+                    Err(e) => {
+                        user.respond("failed to boost user, sorry :(");
+                        log_err!(e, "failed to modify currency");
+                    }
+                }
             }
             Some("windfall") => {
                 ctx.check_scope(Scope::CurrencyWindfall)?;

diff --git a/bot/src/main.rs b/bot/src/main.rs
@@ -262,6 +262,7 @@ fn main() -> Result<(), Error> {
     let mut error_backoff = backoff::ExponentialBackoff::default();
     error_backoff.current_interval = time::Duration::from_secs(30);
     error_backoff.initial_interval = time::Duration::from_secs(30);
+    error_backoff.max_elapsed_time = None;
 
     let mut current_backoff;
     let mut errored = false;
@@ -326,25 +327,24 @@ fn main() -> Result<(), Error> {
             break;
         }
 
-        if let Some(current_backoff) = current_backoff.as_ref() {
+        if let Some(current_backoff) = current_backoff.clone() {
             log::info!(
                 "Restarting in {}...",
-                utils::compact_duration(current_backoff)
+                utils::compact_duration(&current_backoff)
             );
 
             let system = system.clone();
 
-            let system_interrupt = async move {
-                future::select(
-                    system.wait_for_shutdown().boxed(),
-                    system.wait_for_restart().boxed(),
-                )
-                .await;
-            };
-
-            let delay = tokio::time::delay_for(*current_backoff);
-
-            let _ = runtime.block_on(future::select(system_interrupt.boxed(), delay));
+            runtime.block_on(async move {
+                tokio::select! {
+                    _ = system.wait_for_shutdown() => {
+                    }
+                    _ = system.wait_for_restart() => {
+                    }
+                    _ = tokio::time::delay_for(current_backoff) => {
+                    }
+                }
+            });
         }
 
         if !errored {

diff --git a/bot/src/module/promotions.rs b/bot/src/module/promotions.rs
@@ -110,11 +110,9 @@ impl super::Module for Module {
                             let promotions = promotions.clone();
                             let sender = sender.clone();
 
-                            tokio::spawn(async move {
-                                if let Err(e) = promote(promotions, sender) {
-                                    log::error!("failed to send promotion: {}", e);
-                                }
-                            });
+                            if let Err(e) = promote(promotions, sender) {
+                                log::error!("failed to send promotion: {}", e);
+                            }
                         }
                     }
                 }