startup: use in server

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/server.rs b/src/bin/server.rs
index d97cf1cf59e93ce25fc6978bf8c5ce13b3dabe2c..20da0ddcfb08da6a367ec0c1003f149419c93830 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -14,14 +14,10 @@ pub struct Opts {
 }
 
 #[tokio::main]
-async fn main() -> Result<(), AE> {
+async fn main() {
   let opts = Opts::from_args();
-
-  let ics = config::read(&opts.config, LinkEnd::Server)?;
-
-  opts.log.log_init()?;
+  let ics = config::startup("hippotatd", LinkEnd::Server,
+                            &opts.config, &opts.log);
 
   dbg!(ics);
-
-  Ok(())
 }