improve error messages for socket bind and connect errors

src/proxy.rs

@@ -23,7 +23,9 @@ pub async fn run(config: &Config, server: String, args: Vec<String>) -> Result<(
         }
     }
 
-    let mut stream = Stream::connect(&config.connect).await.context("connect")?;
+    let mut stream = Stream::connect(&config.connect)
+        .await
+        .context("connecting to server")?;
     let mut stdio = BufStream::new(io::join(io::stdin(), io::stdout()));
 
     // Wait for the client to send `initialize` request.

src/server.rs

@@ -15,6 +15,7 @@ pub async fn run(config: &Config) -> Result<()> {
     let next_client_id = || next_client_id.fetch_add(1, Ordering::Relaxed);
 
     let listener = Listener::bind(&config.listen).await.context("listen")?;
+    info!(socket = ?config.listen, "listening");
     loop {
         match listener.accept().await {
             Ok((socket, _addr)) => {

src/socketwrapper.rs

@@ -4,6 +4,7 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{io, net};
 
+use anyhow::{Context as _, Result};
 use pin_project_lite::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio::net::{tcp, TcpListener, TcpStream};
@@ -136,15 +137,17 @@ pin_project! {
 }
 
 impl Stream {
-    pub async fn connect(addr: &Address) -> io::Result<Stream> {
+    pub async fn connect(addr: &Address) -> Result<Stream> {
         match addr {
-            Address::Tcp(ip_addr, port) => Ok(Stream::Tcp {
-                tcp: TcpStream::connect((*ip_addr, *port)).await?,
-            }),
+            Address::Tcp(ip_addr, port) => TcpStream::connect((*ip_addr, *port))
+                .await
+                .with_context(|| format!("connecting to tcp socket {ip_addr}:{port}"))
+                .map(|tcp| Stream::Tcp { tcp }),
             #[cfg(target_family = "unix")]
-            Address::Unix(path) => Ok(Stream::Unix {
-                unix: UnixStream::connect(path).await?,
-            }),
+            Address::Unix(path) => UnixStream::connect(path)
+                .await
+                .with_context(|| format!("connecting to unix socket {path:?}"))
+                .map(|unix| Stream::Unix { unix }),
         }
     }
 
@@ -232,19 +235,25 @@ pub enum Listener {
 }
 
 impl Listener {
-    pub async fn bind(addr: &Address) -> io::Result<Listener> {
+    pub async fn bind(addr: &Address) -> Result<Listener> {
         match addr {
-            Address::Tcp(ip_addr, port) => {
-                Ok(Listener::Tcp(TcpListener::bind((*ip_addr, *port)).await?))
-            }
+            Address::Tcp(ip_addr, port) => TcpListener::bind((*ip_addr, *port))
+                .await
+                .with_context(|| format!("binding to tcp socket {ip_addr}:{port}"))
+                .map(Listener::Tcp),
             #[cfg(target_family = "unix")]
             Address::Unix(path) => {
                 match fs::remove_file(path) {
                     Ok(()) => (),
                     Err(e) if e.kind() == io::ErrorKind::NotFound => (),
-                    Err(e) => return Err(e),
+                    Err(e) => {
+                        return Err(e)
+                            .with_context(|| format!("removing old unix socket file {path:?}"))
+                    }
                 }
-                Ok(Listener::Unix(UnixListener::bind(path)?))
+                UnixListener::bind(path)
+                    .with_context(|| format!("binding to unix socket {path:?}"))
+                    .map(Listener::Unix)
             }
         }
     }