From b0034ec3e344030274c98cf81f75789d80ce6211 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 26 Mar 2021 01:23:57 +0100 Subject: use constant string for socket path --- mumd/src/main.rs | 8 ++++---- mumlib/src/lib.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mumd/src/main.rs b/mumd/src/main.rs index c596b8f..5b71ae0 100644 --- a/mumd/src/main.rs +++ b/mumd/src/main.rs @@ -24,7 +24,7 @@ async fn main() { notify::init(); // check if another instance is live - let connection = UnixStream::connect("/tmp/mumd").await; + let connection = UnixStream::connect(mumlib::SOCKET_PATH).await; match connection { Ok(stream) => { let (reader, writer) = stream.into_split(); @@ -41,12 +41,12 @@ async fn main() { } } debug!("a dead socket was found, removing"); - tokio::fs::remove_file("/tmp/mumd").await.unwrap(); + tokio::fs::remove_file(mumlib::SOCKET_PATH).await.unwrap(); } Err(e) => { if matches!(e.kind(), std::io::ErrorKind::ConnectionRefused) { debug!("a dead socket was found, removing"); - tokio::fs::remove_file("/tmp/mumd").await.unwrap(); + tokio::fs::remove_file(mumlib::SOCKET_PATH).await.unwrap(); } } } @@ -65,7 +65,7 @@ async fn receive_commands( oneshot::Sender>>, )>, ) { - let socket = UnixListener::bind("/tmp/mumd").unwrap(); + let socket = UnixListener::bind(mumlib::SOCKET_PATH).unwrap(); loop { if let Ok((incoming, _)) = socket.accept().await { diff --git a/mumlib/src/lib.rs b/mumlib/src/lib.rs index 439efa9..bccf073 100644 --- a/mumlib/src/lib.rs +++ b/mumlib/src/lib.rs @@ -6,7 +6,7 @@ pub mod state; use colored::*; use log::*; -pub const SOCKET_PATH: &str = "/var/tmp/mumd"; +pub const SOCKET_PATH: &str = "/tmp/mumd"; pub const DEFAULT_PORT: u16 = 64738; pub fn setup_logger>(target: T, color: bool) { -- cgit v1.2.1