do more things at init time

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main.rs b/src/main.rs
index 091335f..f951f94 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -201,8 +201,8 @@ impl Daemon {
     }
 
     fn run(&self) -> Result<()> {
-        if let Err(e) = self.state.lock().unwrap().setup_wg_peers(self, 0) {
-            error!("Error initializing wireguard peers: {}", e);
+        if let Err(e) = self.initialize() {
+            error!("Error while initializing Wireguard configuration: {}", e);
         }
 
         let request = self.make_packet(&Gossip::Request)?;
@@ -222,6 +222,13 @@ impl Daemon {
         unreachable!()
     }
 
+    fn initialize(&self) -> Result<()> {
+        let mut state = self.state.lock().unwrap();
+        state.read_wg_peers(self)?;
+        state.setup_wg_peers(self, 0)?;
+        Ok(())
+    }
+
     fn wg_loop(&self) -> ! {
         let mut i = 0;
         loop {