aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/main.rs
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2020-10-16 01:43:13 +0200
committerEskil Queseth <eskilq@kth.se>2020-10-16 01:43:13 +0200
commit7e8e67edb7d6ac66fd6073c55053a4e8234710e8 (patch)
tree4c8e04f4b1a031adaf46d39197675d4e500338bd /mumd/src/main.rs
parentd38696eaef440f551fde00e91d73e192d1e8e89b (diff)
parent18a3c0b3cf8254b70857e31ddd2b6213b10db156 (diff)
downloadmum-7e8e67edb7d6ac66fd6073c55053a4e8234710e8.tar.gz
Merge remote-tracking branch 'origin/main' into error-handling
Diffstat (limited to 'mumd/src/main.rs')
-rw-r--r--mumd/src/main.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/mumd/src/main.rs b/mumd/src/main.rs
index 7ab3c61..3a0d7ec 100644
--- a/mumd/src/main.rs
+++ b/mumd/src/main.rs
@@ -37,7 +37,6 @@ async fn main() {
);
let state = Arc::new(Mutex::new(state));
- // Run it
let (_, _, _, e) = join!(
network::tcp::handle(
Arc::clone(&state),
@@ -54,7 +53,7 @@ async fn main() {
state,
command_receiver,
),
- spawn_blocking(move || {
+ spawn_blocking(move || { // IpcSender is blocking
receive_oneshot_commands(command_sender);
}),
);
@@ -68,7 +67,7 @@ fn receive_oneshot_commands(
// create listener
let (server, server_name): (IpcOneShotServer<(Command, IpcSender<mumlib::error::Result<Option<CommandResponse>>>)>, String) = IpcOneShotServer::new().unwrap();
fs::write("/var/tmp/mumd-oneshot", &server_name).unwrap();
- debug!("Listening for command at {}...", server_name);
+ debug!("Listening to {}", server_name);
// receive command and response channel
let (_, conn): (_, (Command, IpcSender<mumlib::error::Result<Option<CommandResponse>>>)) = server.accept().unwrap();