From 2b31859e23f3fb17abd0984bba710e93cc0356fb Mon Sep 17 00:00:00 2001
From: rasul <rascul3@gmail.com>
Date: Tue, 29 Oct 2019 22:19:25 -0500
Subject: [PATCH] move shutdown stuff out of startup()

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

diff --git a/src/main.rs b/src/main.rs
index ed79520..24bb6e7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ mod proc;
 mod result;
 
 use apps::Apps;
+use proc::Proc;
 use result::Result;
 
 fn main() {
@@ -26,17 +27,25 @@ fn main() {
 		error!("FATAL: {:?}", e);
 		std::process::exit(1);
 	}
+
+	match startup() {
+		Ok(p) => {
+			info!("shutting down");
+			for mut proc in p {
+				proc.stop();
+			}
+		}
+		Err(e) => {
+			error!("FATAL: {:?}", e);
+			std::process::exit(1);
+		}
+	};
 }
 
-fn startup() -> Result<()> {
+fn startup() -> Result<Vec<Proc>> {
 	let apps = Apps::load("sup.toml")?;
 	let (procs, holds) = apps.start();
 	let procs = apps.run(procs, holds)?;
 
-	info!("shutting down");
-	for mut proc in procs {
-		proc.stop();
-	}
-
-	Ok(())
+	Ok(procs)
 }