From 76db19f14c616e879f613b533ee5072c661f8a10 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 10 Jun 2022 11:18:21 +0200 Subject: stuff --- karld/src/interface.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'karld/src/interface.rs') diff --git a/karld/src/interface.rs b/karld/src/interface.rs index 884aca2..99ef594 100644 --- a/karld/src/interface.rs +++ b/karld/src/interface.rs @@ -1,5 +1,5 @@ use crate::handle_packet; -use karlcommon::{ClientboundPacket, ServerboundPacket}; +use karlcommon::{socket_path, ClientboundPacket, ServerboundPacket}; use log::{debug, error, info, warn}; use std::io; use std::io::{BufRead, BufReader, ErrorKind, Write}; @@ -7,7 +7,7 @@ use std::os::unix::net::{UnixListener, UnixStream}; use std::thread; pub fn network_loop() { - let listener = UnixListener::bind("/run/user/1000/calendar").unwrap(); + let listener = UnixListener::bind(socket_path()).unwrap(); info!("listening."); let mut id_counter = 0; @@ -58,9 +58,12 @@ fn handle_connection(id: u32, mut stream: UnixStream) -> io::Result<()> { debug!("{id} <- {packet:?}"); handle_packet(id, packet, responder.clone()); } - Err(err) => responder - .send(ClientboundPacket::Error(format!("{}", &err))) - .map_err(|_| io::Error::from(ErrorKind::InvalidInput))?, + Err(err) => { + warn!("client error: {:?}", &err); + responder + .send(ClientboundPacket::Error(format!("{}", &err))) + .map_err(|_| io::Error::from(ErrorKind::InvalidInput))? + } } buf.clear(); -- cgit v1.2.3-70-g09d2