From d484c05e56194346944b295968c66ccc0e543534 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Wed, 24 Mar 2021 21:38:51 +0100 Subject: remove ipc-channel dependency --- mumctl/src/main.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index d07a482..3cbbcf7 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -1,15 +1,15 @@ use clap::{App, AppSettings, Arg, Shell, SubCommand, ArgMatches}; use colored::Colorize; -use ipc_channel::ipc::{self, IpcSender}; use log::{error, warn}; use log::{Record, Level, Metadata, LevelFilter}; use mumlib::command::{Command, CommandResponse}; use mumlib::config; use mumlib::config::{ServerConfig, Config}; use mumlib::state::Channel; -use std::io::BufRead; -use std::{fs, io, iter, fmt}; +use std::io::{BufRead, Write}; +use std::{io::{self, Read}, iter, fmt}; use std::fmt::{Display, Formatter}; +use std::os::unix::net::UnixStream; const INDENTATION: &str = " "; @@ -615,16 +615,17 @@ fn parse_status(server_state: &mumlib::state::Server) { } fn send_command(command: Command) -> Result>, crate::Error> { - let (tx_client, rx_client) = - ipc::channel::>>().unwrap(); + let mut connection = UnixStream::connect("/tmp/mumd").unwrap(); - let server_name = fs::read_to_string(mumlib::SOCKET_PATH).unwrap(); //TODO don't panic + let serialized = bincode::serialize(&command).unwrap(); - let tx0 = IpcSender::connect(server_name).map_err(|_| Error::ConnectionError)?; + connection.write(&(serialized.len() as u32).to_be_bytes()).unwrap(); + connection.write(&serialized).unwrap(); - tx0.send((command, tx_client)).unwrap(); + connection.read_exact(&mut [0; 4]).unwrap(); + let response = bincode::deserialize_from(&mut connection).unwrap(); - Ok(rx_client.recv().unwrap()) + Ok(response) } fn print_channel(channel: &Channel, depth: usize) { -- cgit v1.2.1 From 5cc61e8d2140280421b5962b2911ebbcc927e9d1 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 26 Mar 2021 01:15:55 +0100 Subject: re-add error checking --- mumctl/src/main.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 3cbbcf7..123f5cd 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -615,15 +615,15 @@ fn parse_status(server_state: &mumlib::state::Server) { } fn send_command(command: Command) -> Result>, crate::Error> { - let mut connection = UnixStream::connect("/tmp/mumd").unwrap(); + let mut connection = UnixStream::connect("/tmp/mumd").map_err(|_| Error::ConnectionError)?; let serialized = bincode::serialize(&command).unwrap(); - connection.write(&(serialized.len() as u32).to_be_bytes()).unwrap(); - connection.write(&serialized).unwrap(); + connection.write(&(serialized.len() as u32).to_be_bytes()).map_err(|_| Error::ConnectionError)?; + connection.write(&serialized).map_err(|_| Error::ConnectionError)?; - connection.read_exact(&mut [0; 4]).unwrap(); - let response = bincode::deserialize_from(&mut connection).unwrap(); + connection.read_exact(&mut [0; 4]).map_err(|_| Error::ConnectionError)?; + let response = bincode::deserialize_from(&mut connection).map_err(|_| Error::ConnectionError)?; Ok(response) } -- cgit v1.2.1 From c22a8731df928ebce1859728cd55873503f72982 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 26 Mar 2021 01:50:16 +0100 Subject: clean up imports --- mumctl/src/main.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 123f5cd..018bc3a 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -1,15 +1,10 @@ use clap::{App, AppSettings, Arg, Shell, SubCommand, ArgMatches}; use colored::Colorize; -use log::{error, warn}; -use log::{Record, Level, Metadata, LevelFilter}; +use log::{Record, Level, Metadata, LevelFilter, error, warn}; use mumlib::command::{Command, CommandResponse}; -use mumlib::config; -use mumlib::config::{ServerConfig, Config}; +use mumlib::config::{self, ServerConfig, Config}; use mumlib::state::Channel; -use std::io::{BufRead, Write}; -use std::{io::{self, Read}, iter, fmt}; -use std::fmt::{Display, Formatter}; -use std::os::unix::net::UnixStream; +use std::{io::{self, Read, BufRead, Write}, iter, fmt::{Display, Formatter}, os::unix::net::UnixStream}; const INDENTATION: &str = " "; -- cgit v1.2.1 From bb81c02ddf4f9cc6ab0dbceea890e1be06fdbcf0 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sun, 28 Mar 2021 17:42:45 +0200 Subject: fix import --- mumctl/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 018bc3a..0b948c0 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -654,7 +654,7 @@ enum Error { } impl Display for Error { - fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "Unable to connect to mumd. Is mumd running?") } } -- cgit v1.2.1 From 0e56945163d1447b2127f5499f6b897b41271d40 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Mon, 29 Mar 2021 00:45:09 +0200 Subject: update according to feedback --- mumctl/src/main.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 0b948c0..9d9e4fd 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -610,7 +610,7 @@ fn parse_status(server_state: &mumlib::state::Server) { } fn send_command(command: Command) -> Result>, crate::Error> { - let mut connection = UnixStream::connect("/tmp/mumd").map_err(|_| Error::ConnectionError)?; + let mut connection = UnixStream::connect(mumlib::SOCKET_PATH).map_err(|_| Error::ConnectionError)?; let serialized = bincode::serialize(&command).unwrap(); @@ -618,9 +618,7 @@ fn send_command(command: Command) -> Result Date: Mon, 29 Mar 2021 00:46:23 +0200 Subject: re-add trailing newline --- mumctl/src/main.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 9d9e4fd..7475d4d 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -656,3 +656,4 @@ impl Display for Error { write!(f, "Unable to connect to mumd. Is mumd running?") } } + -- cgit v1.2.1 From d0eb98decf0d78957acc870624c338b75fc24edf Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Mon, 29 Mar 2021 00:47:26 +0200 Subject: re-add trailing newline 2 electric boogaloo --- mumctl/src/main.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 7475d4d..9d9e4fd 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -656,4 +656,3 @@ impl Display for Error { write!(f, "Unable to connect to mumd. Is mumd running?") } } - -- cgit v1.2.1