From 0f63c5e5942ae4e9eb4719b38006081f1c200d23 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 24 Sep 2019 19:42:21 +0200
Subject: [PATCH] Nits

---
 src/main.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c941316..84478d2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -527,15 +527,11 @@ fn main() -> Result<(), Error> {
         updater.update();
     }
     runtime.spawn(updater.run());
-    runtime.spawn(
-        start(globals, runtime.clone())
-            .map_err(|e| {
-                error!("Unable to start the service: [{}]", e);
-                std::process::exit(1);
-            })
-            .map(|_| ()),
-    );
-    runtime.block_on(future::pending::<()>());
-
-    Ok(())
+    match runtime.block_on(start(globals, runtime.clone())) {
+        Ok(()) => Ok(()),
+        Err(e) => {
+            error!("Unable to start the service: [{}]", e);
+            std::process::exit(1);
+        }
+    }
 }