diff options
Diffstat (limited to 'karld/src')
-rw-r--r-- | karld/src/interface.rs | 13 | ||||
-rw-r--r-- | karld/src/main.rs | 2 |
2 files changed, 10 insertions, 5 deletions
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(); diff --git a/karld/src/main.rs b/karld/src/main.rs index 6cf902e..7fa47e2 100644 --- a/karld/src/main.rs +++ b/karld/src/main.rs @@ -5,9 +5,11 @@ use std::{collections::HashMap, sync::RwLock}; use crossbeam_channel::Sender; use interface::network_loop; use karlcommon::{Task, Condition, Property, ServerboundPacket, ClientboundPacket}; +use log::info; fn main() { env_logger::init(); + info!("logging"); TASKS.write().unwrap().insert( 0, Task { |