Move logging::setup out of main.rs

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

diff --git a/daemon/logging.rs b/daemon/logging.rs
index 80596ee0e4d3c1ab1e4c98451b1f05b5160af4e4..42e5a63a7ccbe5f48ac8901d086b1f41e79cdd76 100644 (file)
--- a/daemon/logging.rs
+++ b/daemon/logging.rs
@@ -37,3 +37,12 @@ pub const BASIC_FORMAT: FormatFunction = basic_format;
 pub const ADAPTIVE_FORMAT: AdaptiveFormat = AdaptiveFormat::Custom(
   basic_format, coloured_format
 );
+
+#[throws(StartupError)]
+pub fn setup() {
+  flexi_logger::Logger::with(log_config())
+    .format(BASIC_FORMAT)
+    .adaptive_format_for_stderr(ADAPTIVE_FORMAT)
+    .adaptive_format_for_stdout(ADAPTIVE_FORMAT)
+    .start()?;
+}

diff --git a/daemon/main.rs b/daemon/main.rs
index 5c8b605c54a3ff768d6038bad1c7d3a43e3fc18b..8540b1f75951d18c482e1554a26a8b5e5e0c960a 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -487,12 +487,7 @@ async fn main() -> Result<(),StartupError> {
                      PathResolveMethod::Chdir)?;
 
   let c = config();
-
-  flexi_logger::Logger::with(log_config())
-    .format(logging::BASIC_FORMAT)
-    .adaptive_format_for_stderr(logging::ADAPTIVE_FORMAT)
-    .adaptive_format_for_stdout(logging::ADAPTIVE_FORMAT)
-    .start()?;
+  logging::setup().context("initialise logging")?;
 
   debug!("resolved config: {:#?}", c);