bstein/lesavka
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server logging update

Browse Source
This commit is contained in:
Brad Stein 2025-06-25 20:00:34 -05:00
parent 5d390e495c
commit 02e895053b
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/install-server.sh
View File

@ -105,6 +105,11 @@ After=network.target lesavka-core.service
ExecStart=/usr/local/bin/lesavka-server ExecStart=/usr/local/bin/lesavka-server
Restart=always Restart=always
Environment=RUST_LOG=lesavka_server=debug,lesavka_server::usb_gadget=trace Environment=RUST_LOG=lesavka_server=debug,lesavka_server::usb_gadget=trace
Environment=RUST_BACKTRACE=1
Restart=always
RestartSec=2
StartLimitIntervalSec=30
StartLimitBurst=10
User=root User=root
[Install] [Install]

38
server/src/main.rs
View File

@ -3,7 +3,7 @@
#![forbid(unsafe_code)] #![forbid(unsafe_code)]
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::{pin::Pin, sync::Arc, time::Duration}; use std::{panic, backtrace::Backtrace, pin::Pin, sync::Arc, time::Duration};
use futures_util::{Stream, StreamExt}; use futures_util::{Stream, StreamExt};
use tokio::{fs::{OpenOptions}, io::AsyncWriteExt, sync::Mutex}; use tokio::{fs::{OpenOptions}, io::AsyncWriteExt, sync::Mutex};
use tokio_stream::{wrappers::ReceiverStream}; use tokio_stream::{wrappers::ReceiverStream};
@ -63,14 +63,17 @@ async fn open_with_retry(
.await .await
{ {
Ok(f) => { Ok(f) => {
info!("✅ opened {path} on attempt #{attempt}"); info!("✅ opened {path} ✅ after {attempt} attempt(s)");
return Ok(f); return Ok(f);
} }
Err(e) if attempt < retries => { Err(e) if attempt < retries => {
warn!("🕒 {path} not ready ({e}); retrying… #{attempt}"); // will retry warn!("🕒 {path} not ready ({e:?}); retry {attempt}/{retries}");
tokio::time::sleep(Duration::from_millis(delay_ms)).await; tokio::time::sleep(Duration::from_millis(delay_ms)).await;
} }
Err(e) => return Err(e).with_context(|| format!("giving up on {path}")), Err(e) => {
error!("💥 giving up on {path}: {e:?}");
return Err(e).with_context(|| format!("opening {path}"));
}
} }
} }
unreachable!() unreachable!()
@ -86,13 +89,17 @@ struct Handler {
impl Handler { impl Handler {
async fn make(gadget: UsbGadget) -> anyhow::Result<Self> { async fn make(gadget: UsbGadget) -> anyhow::Result<Self> {
info!("🛠️ Handler::make - cycling gadget ...");
gadget.cycle()?; gadget.cycle()?;
tokio::time::sleep(Duration::from_secs(1)).await; tokio::time::sleep(Duration::from_millis(500)).await;
let kb = open_with_retry("/dev/hidg0", 10, 100).await?; info!("🛠️ opening HID endpoints ...");
let ms = open_with_retry("/dev/hidg1", 10, 100).await?; let kb = open_with_retry("/dev/hidg0", 20, 50).await?;
let ms = open_with_retry("/dev/hidg1", 20, 50).await?;
Ok(Self { kb: Arc::new(Mutex::new(kb)), info!("✅ HID endpoints ready");
Ok(Self {
kb: Arc::new(Mutex::new(kb)),
ms: Arc::new(Mutex::new(ms)), ms: Arc::new(Mutex::new(ms)),
gadget, gadget,
did_cycle: AtomicBool::new(true), did_cycle: AtomicBool::new(true),
@ -220,11 +227,22 @@ async fn main() -> anyhow::Result<()> {
/* logging */ /* logging */
let _log_guard: WorkerGuard = init_tracing()?; let _log_guard: WorkerGuard = init_tracing()?;
panic::set_hook(Box::new(|p| {
let bt = Backtrace::force_capture();
error!("💥 panic: {p}\n{bt}");
}));
/* auto‑cycle task */ /* auto‑cycle task */
// tokio::spawn(async { monitor_gc311_disconnect().await.ok(); }); // tokio::spawn(async { monitor_gc311_disconnect().await.ok(); });
let gadget = UsbGadget::new("lesavka"); let gadget = UsbGadget::new("lesavka");
let handler = Handler::make(gadget.clone()).await?; let handler = match Handler::make(gadget.clone()).await {
Ok(h) => h,
Err(e) => {
error!("💥 failed to create Handler: {e:#}");
std::process::exit(1);
}
};
// tokio::spawn({ // tokio::spawn({
// let gadget = gadget.clone(); // let gadget = gadget.clone();
@ -232,7 +250,7 @@ async fn main() -> anyhow::Result<()> {
// loop { // loop {
// tokio::time::sleep(Duration::from_secs(4)).await; // tokio::time::sleep(Duration::from_secs(4)).await;
// if LAST_HID_WRITE.elapsed().as_secs() > 3 { // if LAST_HID_WRITE.elapsed().as_secs() > 3 {
// warn!("no HID traffic in 3 s – cycling UDC"); // warn!("no HID traffic in 3 s - cycling UDC");
// let _ = gadget.cycle(); // let _ = gadget.cycle();
// } // }
// } // }