Compare commits

..

No commits in common. "d4bd0ef1cac256e9e9202570e33ce6216cfb1d2e" and "75bfd4d5cf08f2b877e697bc3bdc269b12fe39c6" have entirely different histories.

3 changed files with 6 additions and 26 deletions

View File

@ -1,6 +1,6 @@
use std::pin::Pin;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::task::{Context, Poll};
use pin_project_lite::pin_project;
@ -14,34 +14,25 @@ pub struct Stats {
connections: AtomicUsize,
rx: AtomicUsize,
tx: AtomicUsize,
failed: AtomicBool,
}
impl Stats {
pub fn add_connection(&self) {
self.connections.store(1, Ordering::Relaxed);
self.connections.fetch_add(1, Ordering::Relaxed);
}
pub fn add_rx_bytes(&self, n: usize) {
self.rx.store(n, Ordering::Relaxed);
self.rx.fetch_add(n, Ordering::Relaxed);
}
pub fn add_tx_bytes(&self, n: usize) {
self.tx.store(n, Ordering::Relaxed);
self.tx.fetch_add(n, Ordering::Relaxed);
}
pub fn connections(&self) -> usize {
self.connections.load(Ordering::Relaxed)
}
pub fn failed(&self) -> bool {
self.failed.load(Ordering::Relaxed)
}
pub fn set_failed(&self, failed: bool) {
self.failed.store(failed, Ordering::Relaxed);
}
pub fn rx(&self) -> Unit {
Unit::new(self.rx.load(Ordering::Relaxed), "B")
}

View File

@ -40,12 +40,7 @@ impl TunnelInner {
&self.internal_address,
self.port,
)
.await
.inspect_err(|_| {
self.stats.set_failed(true);
})?;
self.stats.set_failed(false);
.await?;
Ok(TrackStats::new(channel.into_stream(), self.stats.clone()))
}

View File

@ -17,15 +17,9 @@ pub struct TunnelRow {
impl From<&TunnelRow> for Vec<Span<'static>> {
fn from(row: &TunnelRow) -> Self {
let port = if row.stats.failed() {
row.port.clone().red()
} else {
row.port.clone()
};
vec![
row.name.clone(),
port,
row.port.clone(),
row.access.clone(),
row.address.clone(),
row.stats.connections().to_string().into(),