aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil <eskilq@kth.se>2020-10-18 02:12:58 +0200
committerEskil <eskilq@kth.se>2020-10-18 02:12:58 +0200
commitf30b372d5c08d3c30c4b5ab02c11d236cac804e6 (patch)
tree8fb352640247746b35c2c112918d7eb8754dd1d8
parentccc5f76133460d055a5d90ae9cd0a7bc2a83551d (diff)
parent70a908fdee11a809aec4eefccc60ef96627bed75 (diff)
downloadmum-f30b372d5c08d3c30c4b5ab02c11d236cac804e6.tar.gz
Merge branch 'socket' into 'main'
refactor socket path storage location Closes #34 See merge request gustav/mum!11
-rw-r--r--mumctl/src/main.rs2
-rw-r--r--mumd/src/main.rs2
-rw-r--r--mumlib/src/lib.rs2
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| {