WIP: functional checkpoint!
This commit is contained in:
1 parent
0b9fe272d3
commit
3871772d9b
1 file changed
+4
-8
+4
-8
@@ -50,16 +50,14 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
// Resolve serial port
|
// Resolve serial port
|
||||||
let port = match args.port {
|
let port = match args.port {
|
||||||
Some(p) => p,
|
Some(p) => p,
|
||||||
None => {
|
None => tokio::task::spawn_blocking(|| {
|
||||||
tokio::task::spawn_blocking(|| {
|
|
||||||
donglora_client::find_port().unwrap_or_else(|| {
|
donglora_client::find_port().unwrap_or_else(|| {
|
||||||
info!("waiting for DongLoRa device...");
|
info!("waiting for DongLoRa device...");
|
||||||
donglora_client::wait_for_device()
|
donglora_client::wait_for_device()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.map_err(|e| anyhow::anyhow!("device discovery task failed: {e}"))?
|
.map_err(|e| anyhow::anyhow!("device discovery task failed: {e}"))?,
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Resolve socket path
|
// Resolve socket path
|
||||||
@@ -102,11 +100,9 @@ fn parse_tcp_addr(tcp: &str) -> Option<(String, u16)> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn signal_handler(shutdown: CancellationToken) -> anyhow::Result<()> {
|
async fn signal_handler(shutdown: CancellationToken) -> anyhow::Result<()> {
|
||||||
let mut sigint =
|
let mut sigint = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::interrupt())
|
||||||
tokio::signal::unix::signal(tokio::signal::unix::SignalKind::interrupt())
|
|
||||||
.map_err(|e| anyhow::anyhow!("failed to register SIGINT handler: {e}"))?;
|
.map_err(|e| anyhow::anyhow!("failed to register SIGINT handler: {e}"))?;
|
||||||
let mut sigterm =
|
let mut sigterm = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
|
||||||
tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
|
|
||||||
.map_err(|e| anyhow::anyhow!("failed to register SIGTERM handler: {e}"))?;
|
.map_err(|e| anyhow::anyhow!("failed to register SIGTERM handler: {e}"))?;
|
||||||
|
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
|
|||||||
Reference in new issue
Block a user