From 944ca510ccde61ecb30d40b923837d6e0d9f9b4f Mon Sep 17 00:00:00 2001 From: Nikos Fazakis Date: Thu, 29 Dec 2022 22:22:16 +0200 Subject: [PATCH] mac wakeup compact code --- src/server.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/server.rs b/src/server.rs index 89a5b9314..a81684d19 100644 --- a/src/server.rs +++ b/src/server.rs @@ -93,14 +93,6 @@ pub fn new() -> ServerPtr { Arc::new(RwLock::new(server)) } -fn mac_wakeup(){ - #[cfg(target_os = "macos")]{ - use std::process::Command; - Command::new("/usr/bin/caffeinate").arg("-u").arg("-t 5").spawn().ok(); - log::info!("wake up macos"); - } -} - async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) -> ResultType<()> { let local_addr = socket.local_addr(); drop(socket); @@ -112,7 +104,6 @@ async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) -> if let Ok((stream, addr)) = timeout(CONNECT_TIMEOUT, listener.accept()).await? { stream.set_nodelay(true).ok(); let stream_addr = stream.local_addr()?; - mac_wakeup(); create_tcp_connection(server, Stream::from(stream, stream_addr), addr, secure).await?; } Ok(()) @@ -203,6 +194,11 @@ pub async fn create_tcp_connection( } } + #[cfg(target_os = "macos")]{ + use std::process::Command; + Command::new("/usr/bin/caffeinate").arg("-u").arg("-t 5").spawn().ok(); + log::info!("wake up macos"); + } Connection::start(addr, stream, id, Arc::downgrade(&server)).await; Ok(()) } @@ -261,7 +257,6 @@ async fn create_relay_connection_( ..Default::default() }); stream.send(&msg_out).await?; - mac_wakeup(); create_tcp_connection(server, stream, peer_addr, secure).await?; Ok(()) }