refactor checkpoint

veilid-server/src/server.rs

@@ -3,10 +3,10 @@ use crate::settings::*;
 use crate::veilid_logs::*;
 use flume::{bounded, Receiver, Sender};
 use lazy_static::*;
-use log::*;
 use parking_lot::Mutex;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
+use tracing::*;
 use veilid_core::xx::SingleShotEventual;
 
 #[derive(Copy, Clone, PartialEq, Eq)]
@@ -91,41 +91,6 @@ pub async fn run_veilid_server_internal(
             }
         }
     });
-    // Handle log messages on main thread for capnproto rpc
-    let client_log_receiver_jh = capi.clone().and_then(|capi| {
-        logs.client_log_channel
-            .clone()
-            .map(|mut client_log_channel| {
-                async_std::task::spawn_local(async move {
-                    // Batch messages to either 16384 chars at once or every second to minimize packets
-                    let rate = Duration::from_secs(1);
-                    let mut start = Instant::now();
-                    let mut messages = String::new();
-                    loop {
-                        let timeout_dur =
-                            rate.checked_sub(start.elapsed()).unwrap_or(Duration::ZERO);
-                        match async_std::future::timeout(timeout_dur, client_log_channel.recv())
-                            .await
-                        {
-                            Ok(Ok(message)) => {
-                                messages += &message;
-                                if messages.len() > 16384 {
-                                    capi.clone()
-                                        .handle_client_log(core::mem::take(&mut messages));
-                                    start = Instant::now();
-                                }
-                            }
-                            Ok(Err(_)) => break,
-                            Err(_) => {
-                                capi.clone()
-                                    .handle_client_log(core::mem::take(&mut messages));
-                                start = Instant::now();
-                            }
-                        }
-                    }
-                })
-            })
-    });
 
     // Auto-attach if desired
     let mut out = Ok(());
@@ -193,18 +158,8 @@ pub async fn run_veilid_server_internal(
     // Shut down Veilid API to release state change sender
     veilid_api.shutdown().await;
 
-    // Close the client api log channel if it is open to release client log sender
-    if let Some(client_log_channel_closer) = logs.client_log_channel_closer {
-        client_log_channel_closer.close();
-    }
-
     // Wait for update receiver to exit
     update_receiver_jh.await;
 
-    // Wait for client api log receiver to exit
-    if let Some(client_log_receiver_jh) = client_log_receiver_jh {
-        client_log_receiver_jh.await;
-    }
-
     out
 }