break up run() a little bit to remove cognitive load

master
rasul 5 years ago
parent a158607007
commit 47a7dfa7e9

@ -146,15 +146,11 @@ fn main() {
} }
} }
#[allow(clippy::cognitive_complexity)] fn start_apps(apps: Vec<App>) -> (Vec<Proc>, Option<i8>) {
fn run() -> SupResult<()> {
let config = Config::load("sup.toml")?;
info!("loaded config: sup.toml");
let mut procs: Vec<Proc> = Vec::new(); let mut procs: Vec<Proc> = Vec::new();
let mut holds: Option<i8> = None; let mut holds: Option<i8> = None;
for app in config.apps() { for app in apps {
if app.wait.unwrap_or(false) { if app.wait.unwrap_or(false) {
if let Err(e) = app.wait_start() { if let Err(e) = app.wait_start() {
error!("app failed to start: {}: {:?}", &app.name, e); error!("app failed to start: {}: {:?}", &app.name, e);
@ -168,11 +164,20 @@ fn run() -> SupResult<()> {
} }
procs.push(proc); procs.push(proc);
} }
Err(e) => error!("application failed to start: {}: {:?}", name, e), Err(e) => error!("app failed to start: {}: {:?}", name, e),
}; };
} }
} }
(procs, holds)
}
fn run() -> SupResult<()> {
let config = Config::load("sup.toml")?;
info!("loaded config: sup.toml");
let (mut procs, mut holds) = start_apps(config.apps());
if holds.unwrap_or(0) < 1 { if holds.unwrap_or(0) < 1 {
error!("no holds configured"); error!("no holds configured");
return Ok(()); return Ok(());

Loading…
Cancel
Save