IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Persistent BusClient offers "is_connected"

Browse Source 
* At any time, you can ask a BusClient if it is connected.
* If `lqtop` loses connectivity while running, it displays NOT
  CONNECTED in red on the title bar.
* If `lqtop` can't reach the daemon on start, it bails out with
  an error message.
This commit is contained in:
Herbert Wolverson 2023-01-20 17:05:58 +00:00
parent 2deb98a4c1
commit e2f09d14fa
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rust/lqos_bus/src/bus/persistent_client.rs
View File

@ -113,4 +113,8 @@ impl BusClient {
stream.write(&msg).await?;
Ok(())
}
pub fn is_connected(&self) -> bool {
self.stream.is_some()
}
}

20
src/rust/lqtop/src/main.rs
View File

@ -50,13 +50,17 @@ async fn get_data(client: &mut BusClient, n_rows: u16) -> Result<DataResult> {
Ok(result)
}
fn draw_menu<'a>() -> Paragraph<'a> {
let text = Spans::from(vec![
fn draw_menu<'a>(is_connected: bool) -> Paragraph<'a> {
let mut text = Spans::from(vec![
Span::styled("Q", Style::default().fg(Color::Green)),
Span::from("uit"),
]);
Paragraph::new(text)
if !is_connected {
text.0.push(Span::styled(" NOT CONNECTED ", Style::default().fg(Color::Red)))
}
let para = Paragraph::new(text)
.style(Style::default().fg(Color::White))
.alignment(Alignment::Center)
.block(
@ -64,7 +68,9 @@ fn draw_menu<'a>() -> Paragraph<'a> {
.style(Style::default().fg(Color::White))
.border_type(BorderType::Plain)
.title("LibreQoS Monitor"),
)
);
para
}
fn scale_packets(n: u64) -> String {
@ -172,6 +178,10 @@ fn draw_top_pane<'a>(
#[tokio::main(flavor = "current_thread")]
pub async fn main() -> Result<()> {
let mut bus_client = BusClient::new().await?;
if !bus_client.is_connected() {
println!("ERROR: lqosd bus is not available");
std::process::exit(0);
}
let mut packets = (0, 0);
let mut bits = (0, 0);
let mut top = Vec::new();
@ -206,7 +216,7 @@ pub async fn main() -> Result<()> {
.as_ref(),
)
.split(f.size());
f.render_widget(draw_menu(), chunks[0]);
f.render_widget(draw_menu(bus_client.is_connected()), chunks[0]);
n_rows = chunks[1].height;
f.render_widget(draw_top_pane(&top, packets, bits), chunks[1]);
//f.render_widget(bandwidth_chart(datasets.clone(), packets, bits, min, max), chunks[1]);