From 37056a823a574add2cd452a97f328bb170400a0b Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Thu, 4 Jan 2018 19:12:01 +0100
Subject: Return the future on connect instead of adding it to the reactor

---
 bin/main.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'bin/main.rs')

diff --git a/bin/main.rs b/bin/main.rs
index c9749b6..ac25a93 100644
--- a/bin/main.rs
+++ b/bin/main.rs
@@ -78,7 +78,7 @@ fn main() {
 
     // Create an event loop to run the connections on.
     let mut reactor = Core::new().unwrap();
-    let mut task = false;
+    let mut futures = Vec::new();
 
     // Open a connection and add work for each config
     for config in configs {
@@ -105,11 +105,9 @@ fn main() {
             }
         }
 
-        bot.connect(&mut reactor, &config).map(|_| task = true);
+        futures.push(bot.connect(&mut reactor, &config));
     }
 
-    if task {
-        // Run the main loop forever
-        reactor.run(future::empty::<(), ()>()).unwrap();
-    }
+    // Run the bots until they throw an error
+    reactor.run(future::join_all(futures)).unwrap();
 }
-- 
cgit v1.2.3-70-g09d2