liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

log cleanup

Browse Source
This commit is contained in:
John Smith 2023-06-21 14:56:21 -04:00
parent 754abf2135
commit 05d774d23b
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
veilid-cli/src/ui.rs
View File

@ -8,6 +8,7 @@ use cursive::event::*;
use cursive::theme::*; use cursive::theme::*;
use cursive::traits::*; use cursive::traits::*;
use cursive::utils::markup::StyledString; use cursive::utils::markup::StyledString;
use cursive::view::SizeConstraint;
use cursive::views::*; use cursive::views::*;
use cursive::Cursive; use cursive::Cursive;
use cursive::CursiveRunnable; use cursive::CursiveRunnable;
@ -504,6 +505,16 @@ impl UI {
} }
} }
fn on_focus_peers_table_view<T>(ptv: &mut ResizedView<T>) -> EventResult {
ptv.set_height(SizeConstraint::Full);
EventResult::Ignored
}
fn on_focus_lost_peers_table_view<T>(ptv: &mut ResizedView<T>) -> EventResult {
ptv.set_height(SizeConstraint::AtLeast(8));
EventResult::Ignored
}
fn show_connection_dialog(s: &mut Cursive, state: ConnectionState) -> bool { fn show_connection_dialog(s: &mut Cursive, state: ConnectionState) -> bool {
let mut inner = Self::inner_mut(s); let mut inner = Self::inner_mut(s);
@ -829,10 +840,13 @@ impl UI {
.column(PeerTableColumn::TransferDownAvg, "Down", |c| c.width(8)) .column(PeerTableColumn::TransferDownAvg, "Down", |c| c.width(8))
.column(PeerTableColumn::TransferUpAvg, "Up", |c| c.width(8)); .column(PeerTableColumn::TransferUpAvg, "Up", |c| c.width(8));
peers_table_view.set_on_submit(UI::on_submit_peers_table_view); peers_table_view.set_on_submit(UI::on_submit_peers_table_view);
let peers_table_view = peers_table_view let peers_table_view = FocusTracker::new(ResizedView::new(
.with_name("peers") SizeConstraint::Full,
.full_width() SizeConstraint::AtLeast(8),
.min_height(8); peers_table_view.with_name("peers"),
))
.on_focus(UI::on_focus_peers_table_view)
.on_focus_lost(UI::on_focus_lost_peers_table_view);
// attempt at using Mux. Mux has bugs, like resizing problems. // attempt at using Mux. Mux has bugs, like resizing problems.
// let mut mux = Mux::new(); // let mut mux = Mux::new();

4
veilid-core/src/network_manager/network_connection.rs
View File

@ -179,7 +179,7 @@ impl NetworkConnection {
} }
} }
#[instrument(level="trace", skip(message, stats), fields(message.len = message.len()), ret, err)] #[instrument(level="trace", skip(message, stats), fields(message.len = message.len()), ret)]
async fn send_internal( async fn send_internal(
protocol_connection: &ProtocolNetworkConnection, protocol_connection: &ProtocolNetworkConnection,
stats: Arc<Mutex<NetworkConnectionStats>>, stats: Arc<Mutex<NetworkConnectionStats>>,
@ -194,7 +194,7 @@ impl NetworkConnection {
Ok(NetworkResult::Value(out)) Ok(NetworkResult::Value(out))
} }
#[instrument(level="trace", skip(stats), fields(ret.len), err)] #[instrument(level="trace", skip(stats), fields(ret.len))]
async fn recv_internal( async fn recv_internal(
protocol_connection: &ProtocolNetworkConnection, protocol_connection: &ProtocolNetworkConnection,
stats: Arc<Mutex<NetworkConnectionStats>>, stats: Arc<Mutex<NetworkConnectionStats>>,