feat: Daemon variable to differentiate cli and service

Author: sousandrei

debian/firesquid.service

@@ -7,6 +7,7 @@ ExecStart=/usr/bin/firesquid
 Restart=always
 PrivateTmp=true
 NoNewPrivileges=true
+Environment="DAEMON=1"
 
 [Install]
 Alias=firesquid

src/main.rs

@@ -19,31 +19,27 @@ use crate::cli::generate_cli;
 use crate::state::{State, StatePtr};
 
 use std::fs;
-use std::path;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    if env::var("RUST_LOG").is_err() {
+    if env::var_os("RUST_LOG").is_none() {
         env::set_var("RUST_LOG", "info");
     }
 
     tracing_subscriber::fmt::init();
 
-    //TODO: better way of finding out if it's being run by system
-    if !path::Path::new("/tmp/firesquid/lock.pid").exists() {
-        start_daemon().await?;
+    if env::var_os("DAEMON").is_none() {
+        println!("cli goes here");
         return Ok(());
     }
 
-    println!("CLI GOES HERE");
+    start_daemon().await?;
 
     Ok(())
 }
 
 async fn start_daemon() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    info!("Creating lock file");
     fs::create_dir("/tmp/firesquid").ok();
-    fs::File::create("/tmp/firesquid/lock.pid").ok();
 
     let cli_options = match generate_cli() {
         Ok(options) => options,
@@ -94,9 +90,6 @@ async fn start_daemon() -> Result<(), Box<dyn std::error::Error + Send + Sync>>
 
     terminate_all_vms(state_ptr).await;
 
-    info!("Removing lock file");
-    fs::remove_file("/tmp/firesquid/lock.pid").ok();
-
     Ok(())
 }