mirror of
https://github.com/Djeeberjr/fw-anwesenheit.git
synced 2025-07-02 01:04:16 +00:00
gracefull shutdown of PM3
This commit is contained in:
parent
fe4efdda81
commit
427153a614
38
src/pm3.rs
38
src/pm3.rs
@ -2,8 +2,10 @@ use log::{debug, info, trace, warn};
|
|||||||
use std::env;
|
use std::env;
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use std::process::Stdio;
|
use std::process::Stdio;
|
||||||
use tokio::io::{AsyncBufReadExt, BufReader};
|
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
||||||
use tokio::process::Command;
|
use tokio::process::Command;
|
||||||
|
use tokio::select;
|
||||||
|
use tokio::signal::unix::{SignalKind, signal};
|
||||||
use tokio::sync::broadcast;
|
use tokio::sync::broadcast;
|
||||||
|
|
||||||
/// Runs the pm3 binary and monitors it's output
|
/// Runs the pm3 binary and monitors it's output
|
||||||
@ -27,31 +29,43 @@ pub async fn run_pm3(tx: broadcast::Sender<String>) -> Result<(), Box<dyn Error>
|
|||||||
.arg("lf hitag reader -@")
|
.arg("lf hitag reader -@")
|
||||||
.stdout(Stdio::piped())
|
.stdout(Stdio::piped())
|
||||||
.stderr(Stdio::null())
|
.stderr(Stdio::null())
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::piped())
|
||||||
.spawn()?;
|
.spawn()?;
|
||||||
|
|
||||||
let stdout = cmd.stdout.take().ok_or("Failed to get stdout")?;
|
let stdout = cmd.stdout.take().ok_or("Failed to get stdout")?;
|
||||||
|
let mut stdin = cmd.stdin.take().ok_or("Failed to get stdin")?;
|
||||||
|
|
||||||
let mut reader = BufReader::new(stdout).lines();
|
let mut reader = BufReader::new(stdout).lines();
|
||||||
|
|
||||||
let mut last_id: String = "".to_owned();
|
let mut sigterm = signal(SignalKind::terminate())?;
|
||||||
|
|
||||||
while let Some(line) = reader.next_line().await? {
|
let child_handle = tokio::spawn(async move {
|
||||||
trace!("PM3: {line}");
|
let mut last_id: String = "".to_owned();
|
||||||
if let Some(uid) = super::parser::parse_line(&line) {
|
while let Some(line) = reader.next_line().await.unwrap_or(None) {
|
||||||
if last_id == uid {
|
trace!("PM3: {line}");
|
||||||
tx.send(uid.clone())?;
|
if let Some(uid) = super::parser::parse_line(&line) {
|
||||||
|
if last_id == uid {
|
||||||
|
let _ = tx.send(uid.clone());
|
||||||
|
}
|
||||||
|
last_id = uid;
|
||||||
}
|
}
|
||||||
last_id = uid.to_owned();
|
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
|
select! {
|
||||||
|
_ = child_handle => {}
|
||||||
|
_ = sigterm.recv() => {
|
||||||
|
debug!("Graceful shutdown of PM3");
|
||||||
|
let _ = stdin.write_all(b"\n").await;
|
||||||
|
let _ = stdin.flush().await;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let status = cmd.wait().await?;
|
let status = cmd.wait().await?;
|
||||||
|
|
||||||
if status.success() {
|
if status.success() {
|
||||||
Ok(())
|
Ok(())
|
||||||
} else {
|
} else {
|
||||||
Err("PM3 exited with a non zero exit code".into())
|
Err("PM3 exited with a non-zero exit code".into())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user