Merge pull request #158 from erikh/fix-supervise

Fix supervise
zerotier · Feb 23, 2022 · fe14861 · fe14861
2 parents bad93b5 + d25d5e8
commit fe14861
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/bin/zeronsd.rs b/src/bin/zeronsd.rs
@@ -1,12 +1,6 @@
-use std::time::Duration;
-
 use zeronsd::cli::init;
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
-    init().await?;
-
-    loop {
-        tokio::time::sleep(Duration::MAX).await
-    }
+    Ok(init().await?)
 }
diff --git a/src/cli.rs b/src/cli.rs
@@ -3,7 +3,7 @@ use crate::{
     supervise::Properties,
 };
 use log::error;
-use std::path::PathBuf;
+use std::{path::PathBuf, time::Duration};
 
 use clap::{Args, Parser, Subcommand};
 
@@ -106,7 +106,10 @@ pub async fn init() -> Result<(), anyhow::Error> {
     let result = match cli.command {
         Command::Start(args) => {
             start(args).await?;
-            Ok(())
+
+            loop {
+                tokio::time::sleep(Duration::MAX).await
+            }
         }
         Command::Supervise(args) => supervise(args),
         Command::Unsupervise(args) => unsupervise(args),

diff --git a/src/supervise.rs b/src/supervise.rs
@@ -4,7 +4,6 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::anyhow;
-use log::info;
 use regex::Regex;
 use serde::Serialize;
 use tinytemplate::TinyTemplate;
@@ -389,7 +388,7 @@ impl<'a> Properties {
                 _ => systemd_help,
             };
 
-            info!(
+            eprintln!(
                 "Service definition written to {}.\n{}",
                 service_path
                     .to_str()
@@ -413,7 +412,7 @@ impl<'a> Properties {
                 }
             };
 
-            info!(
+            eprintln!(
                 "Service definition written to {}.\nTo start the service, run:\nsudo launchctl load {}",
                 service_path.to_str().expect("Could not coerce service path to string"),
                 service_path.to_str().expect("Could not coerce service path to string")
@@ -438,6 +437,10 @@ impl<'a> Properties {
                     ))
                 }
             };
+            eprintln!(
+                "Service definition removed from {}.\nDon't forget to reload systemd:\nsudo systemctl daemon-reload",
+                self.service_path().to_str().expect("Could not coerce service path to string"),
+            );
         } else if cfg!(target_os = "macos") {
             match std::fs::remove_file(self.service_path()) {
                 Ok(_) => {}
@@ -452,7 +455,7 @@ impl<'a> Properties {
                 }
             };
 
-            info!(
+            eprintln!(
                 "Service definition removed from {}.\nDon't forget to stop it:\nsudo launchctl remove {}",
                 self.service_path().to_str().expect("Could not coerce service path to string"),
                 self.service_name().replace(".plist", "")