From 70a908fdee11a809aec4eefccc60ef96627bed75 Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Sun, 18 Oct 2020 00:50:17 +0200
Subject: refactor socket path storage location

---
 mumctl/src/main.rs | 2 +-
 mumd/src/main.rs   | 2 +-
 mumlib/src/lib.rs  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index 2473195..8237765 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -151,7 +151,7 @@ fn send_command(command: Command) -> mumlib::error::Result<Option<CommandRespons
     let (tx_client, rx_client) =
         ipc::channel::<mumlib::error::Result<Option<CommandResponse>>>().unwrap();
 
-    let server_name = fs::read_to_string("/var/tmp/mumd-oneshot").unwrap(); //TODO don't panic
+    let server_name = fs::read_to_string(mumlib::SOCKET_PATH).unwrap(); //TODO don't panic
 
     let tx0 = IpcSender::connect(server_name).unwrap();
 
diff --git a/mumd/src/main.rs b/mumd/src/main.rs
index 5ae077a..2973157 100644
--- a/mumd/src/main.rs
+++ b/mumd/src/main.rs
@@ -73,7 +73,7 @@ fn receive_oneshot_commands(
             )>,
             String,
         ) = IpcOneShotServer::new().unwrap();
-        fs::write("/var/tmp/mumd-oneshot", &server_name).unwrap();
+        fs::write(mumlib::SOCKET_PATH, &server_name).unwrap();
         debug!("Listening to {}", server_name);
 
         // receive command and response channel
diff --git a/mumlib/src/lib.rs b/mumlib/src/lib.rs
index d989a7e..5a51f37 100644
--- a/mumlib/src/lib.rs
+++ b/mumlib/src/lib.rs
@@ -5,6 +5,8 @@ pub mod state;
 use colored::*;
 use log::*;
 
+pub const SOCKET_PATH: &str = "/var/tmp/mumd";
+
 pub fn setup_logger() {
     fern::Dispatch::new()
         .format(|out, message, record| {
-- 
cgit v1.2.1