andrey/retina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor tweaks to TEARDOWN logging

Browse Source 
*   log everything from the retina::client::teardown module so the
    log level can be tweaked separately.
*   log when the session is expired.
This commit is contained in:
Scott Lamb 2021-09-27 16:03:26 -07:00
parent f682d752a2
commit 6ee24e1c0e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/mod.rs
View File

@ -1752,7 +1752,6 @@ impl PinnedDrop for SessionInner {
} }
}; };
log::debug!("Starting background TEARDOWN for {}", &*session.id);
handle.spawn(teardown::background_teardown( handle.spawn(teardown::background_teardown(
seqnum, seqnum,
this.presentation.base_url.clone(), this.presentation.base_url.clone(),

9
src/client/teardown.rs
View File

@ -24,7 +24,8 @@ pub(super) async fn background_teardown(
mut tx: tokio::sync::watch::Sender<Option<Result<(), Error>>>, mut tx: tokio::sync::watch::Sender<Option<Result<(), Error>>>,
expires: tokio::time::Instant, expires: tokio::time::Instant,
) { ) {
let _ = tokio::time::timeout_at( log::debug!("TEARDOWN {} starting", &*session_id);
if tokio::time::timeout_at(
expires, expires,
teardown_loop_forever( teardown_loop_forever(
base_url, base_url,
@ -35,7 +36,11 @@ pub(super) async fn background_teardown(
&mut tx, &mut tx,
), ),
) )
.await; .await
.is_err()
{
log::debug!("TEARDOWN {} aborted on session expiration", &*session_id);
}
if let Some(ref session_group) = options.session_group { if let Some(ref session_group) = options.session_group {
let seqnum = seqnum.expect("seqnum specified when session_group exists"); let seqnum = seqnum.expect("seqnum specified when session_group exists");
let mut l = session_group.0.lock().unwrap(); let mut l = session_group.0.lock().unwrap();