Просмотр исходного кода

net: return explicit errors when running accept loop

ghassmo 4 лет назад
Родитель
Сommit
4b3227a36f
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      src/net/acceptor.rs

+ 4 - 4
src/net/acceptor.rs

@@ -88,10 +88,10 @@ impl Acceptor {
 
                 if auth_cookie.is_err() {
                     return Err(Error::TorError(
-                    "Please set the env var DARKFI_TOR_COOKIE to the configured tor cookie file. \
+                            "Please set the env var DARKFI_TOR_COOKIE to the configured tor cookie file. \
                     For example: \
                     \'export DARKFI_TOR_COOKIE=\"/var/lib/tor/control_auth_cookie\"\'".to_string(),
-                ))
+                    ))
                 }
 
                 let auth_cookie = auth_cookie.unwrap();
@@ -138,11 +138,11 @@ impl Acceptor {
 
     /// Run the accept loop.
     async fn run_accept_loop(self: Arc<Self>, listener: Box<dyn TransportListener>) -> Result<()> {
-        while let Ok((stream, peer_addr)) = listener.next().await {
+        loop {
+            let (stream, peer_addr) = listener.next().await?;
             let channel = Channel::new(stream, peer_addr).await;
             self.channel_subscriber.notify(Ok(channel)).await;
         }
-        Ok(())
     }
 
     /// Handles network errors. Panics if error passes silently, otherwise