TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-03-25 22:20:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

unix: send SIGTERM instead of killing the service (#59)

Browse Source
This commit is contained in:
Ferdinand Schober
2023-12-27 19:56:43 +01:00
committed by GitHub
parent 4b6faea93a
commit e155819542
4 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontend/cli.rs
View File

@@ -25,7 +25,7 @@ pub fn run() -> Result<()> {
loop {
let mut buf = String::new();
match std::io::stdin().read_line(&mut buf) {
Ok(0) => break,
Ok(0) => return,
Ok(len) => {
if let Some(events) = parse_cmd(buf, len) {
for event in events.iter() {
@@ -48,14 +48,16 @@ pub fn run() -> Result<()> {
}
}
Err(e) => {
log::error!("error reading from stdin: {e}");
break;
if e.kind() != ErrorKind::UnexpectedEof {
log::error!("error reading from stdin: {e}");
}
return;
}
}
}
})?;
let writer = thread::Builder::new()
let _ = thread::Builder::new()
.name("cli-frontend-notify".to_string())
.spawn(move || {
loop {
@@ -124,7 +126,7 @@ pub fn run() -> Result<()> {
}
})?;
match reader.join() {
Ok(_) => (),
Ok(_) => {}
Err(e) => {
let msg = match (e.downcast_ref::<&str>(), e.downcast_ref::<String>()) {
(Some(&s), _) => s,
@@ -134,17 +136,6 @@ pub fn run() -> Result<()> {
log::error!("reader thread paniced: {msg}");
}
}
match writer.join() {
Ok(_) => (),
Err(e) => {
let msg = match (e.downcast_ref::<&str>(), e.downcast_ref::<String>()) {
(Some(&s), _) => s,
(_, Some(s)) => s,
_ => "no panic info",
};
log::error!("writer thread paniced: {msg}");
}
}
Ok(())
}