Merge #90

bors[bot] · blckngm · web-flow · commit 8c887344a8fc · 2019-12-09T12:20:27.000Z
90: Use alternative display of errors, to show full error chian r=sopium a=sopium



Co-authored-by: Guanhao Yin &lt;sopium@mysterious.site&gt;
diff --git a/src/cli/config.rs b/src/cli/config.rs
@@ -241,7 +241,7 @@ impl Config<String> {
                                 endpoint, e
                             );
                         } else {
-                            warn!("failed to resolve {}: {}", endpoint, e);
+                            warn!("failed to resolve {}: {:#}", endpoint, e);
                         }
                         None
                     }
diff --git a/src/cli/reload.rs b/src/cli/reload.rs
@@ -41,15 +41,15 @@ pub async fn reload(wg: &Arc<WgState>, new_config: Config<SocketAddr>) -> anyhow
     if new_fwmark != current_state.fwmark {
         info!("setting fwmark");
         if let Err(e) = wg.set_fwmark(new_fwmark) {
-            warn!("failed to set fwmark to {}: {}", new_fwmark, e);
+            warn!("failed to set fwmark to {}: {:#}", new_fwmark, e);
         }
     }
 
     let new_port = new_config.interface.listen_port.unwrap_or(0);
     if current_state.listen_port != new_port {
         info!("setting listen port");
         if let Err(e) = wg.set_port(new_port).await {
-            warn!("failed to set port to {}: {}", new_port, e);
+            warn!("failed to set port to {}: {:#}", new_port, e);
         }
     }
 
diff --git a/src/cli/run.rs b/src/cli/run.rs
@@ -52,7 +52,7 @@ async fn reload_on_sighup(
                 info!("reloading");
                 do_reload(config_file_path.clone(), &wg)
                     .await
-                    .unwrap_or_else(|e| warn!("error in reloading: {}", e));
+                    .unwrap_or_else(|e| warn!("error in reloading: {:#}", e));
             }
         }
     }
@@ -71,7 +71,7 @@ pub async fn run(
     scope0.clone().spawn_canceller(async move {
         tokio::signal::ctrl_c()
             .await
-            .unwrap_or_else(|e| warn!("ctrl_c failed: {}", e));
+            .unwrap_or_else(|e| warn!("ctrl_c failed: {:#}", e));
         info!("Received SIGINT or Ctrl-C, shutting down.");
     });
 
@@ -136,7 +136,7 @@ pub async fn run(
         scope0.clone().spawn_canceller(async move {
             reload_on_sighup(config_file_path, weak1)
                 .await
-                .unwrap_or_else(|e| warn!("error in reload_on_sighup: {}", e))
+                .unwrap_or_else(|e| warn!("error in reload_on_sighup: {:#}", e))
         });
     }
 
@@ -145,7 +145,7 @@ pub async fn run(
     scope0.clone().spawn_canceller(async move {
         ipc_server(weak, &dev_name, ready_tx)
             .await
-            .unwrap_or_else(|e| error!("IPC server error: {}", e))
+            .unwrap_or_else(|e| error!("IPC server error: {:#}", e))
     });
 
     if ready_rx.await.is_ok() {
@@ -168,7 +168,7 @@ pub async fn run(
 
             if c.general.foreground {
                 super::systemd::notify_ready()
-                    .unwrap_or_else(|e| warn!("failed to notify systemd: {}", e));
+                    .unwrap_or_else(|e| warn!("failed to notify systemd: {:#}", e));
             } else {
                 notify
                     .unwrap()
diff --git a/src/ipc/server.rs b/src/ipc/server.rs
@@ -47,7 +47,7 @@ pub async fn ipc_server(
         let stream = listener.accept().await?;
         tokio::spawn(async move {
             serve(&wg, stream).await.unwrap_or_else(|e| {
-                warn!("Error serving IPC connection: {}", e);
+                warn!("Error serving IPC connection: {:#}", e);
             });
         });
     }
@@ -80,7 +80,7 @@ pub async fn ipc_server(
             let wg = wg.clone();
             tokio::spawn(async move {
                 serve(&wg, stream).await.unwrap_or_else(|e| {
-                    warn!("Error serving IPC connection: {}", e);
+                    warn!("Error serving IPC connection: {:#}", e);
                 });
             });
         }
@@ -168,14 +168,14 @@ async fn process_wg_set(wg: &Arc<WgState>, command: WgSetCommand) -> io::Result<
     if let Some(p) = command.listen_port {
         info!("set listen port");
         wg.set_port(p).await.map_err(|e| {
-            warn!("failed to set port: {}", e);
+            warn!("failed to set port: {:#}", e);
             e
         })?;
     }
     if let Some(fwmark) = command.fwmark {
         info!("set fwmark");
         wg.set_fwmark(fwmark).map_err(|e| {
-            warn!("failed to set fwmark: {}", e);
+            warn!("failed to set fwmark: {:#}", e);
             e
         })?;
     }
diff --git a/src/main.rs b/src/main.rs
@@ -176,7 +176,7 @@ fn main() {
                                 break;
                             }
                             Err(e) => {
-                                warn!("Error read from stdin: {}", e);
+                                warn!("Error read from stdin: {:#}", e);
                                 break;
                             }
                             _ => (),
diff --git a/src/wireguard/state.rs b/src/wireguard/state.rs
@@ -682,15 +682,15 @@ impl WgState {
                         self.mtu.store(mtu, Ordering::Relaxed);
                     }
                 }
-                Err(e) => warn!("failed to get mtu: {}", e),
+                Err(e) => warn!("failed to get mtu: {:#}", e),
             }
         }
     }
 
     /// TX. Tun -> Socket.
     pub async fn task_tx(self: Arc<WgState>) {
         match tun_packet_processing(self).await {
-            Err(e) => error!("error in tx task: {}", e),
+            Err(e) => error!("error in tx task: {:#}", e),
             _ => unreachable!(),
         }
     }
diff --git a/src/wireguard/tun_windows.rs b/src/wireguard/tun_windows.rs
@@ -327,7 +327,7 @@ unsafe impl Send for Tun {}
 impl Drop for Tun {
     fn drop(&mut self) {
         self.close()
-            .unwrap_or_else(|e| warn!("failed to close tun: {}", e))
+            .unwrap_or_else(|e| warn!("failed to close tun: {:#}", e))
     }
 }
 
diff --git a/src/wireguard/tun_windows/interface.rs b/src/wireguard/tun_windows/interface.rs
@@ -174,7 +174,7 @@ impl<'a> Interface<'a> {
 
             match Interface::new(dev_info, &mut dev_info_data, &WINTUN_POOL) {
                 Err(e) => {
-                    warn!("failed Interface::new: {}", e);
+                    warn!("failed Interface::new: {:#}", e);
                     continue;
                 }
                 Ok(w) => {
diff --git a/src/wireguard/tun_windows/pool.rs b/src/wireguard/tun_windows/pool.rs
@@ -546,7 +546,7 @@ impl Pool {
 
             let wintun = match Interface::new(dev_info, &mut device_info_data, self) {
                 Err(e) => {
-                    warn!("failed Interface::new: {}", e);
+                    warn!("failed Interface::new: {:#}", e);
                     continue;
                 }
                 Ok(w) => w,
@@ -764,7 +764,7 @@ impl Pool {
 
         let mut device_info_data = scopeguard::guard(device_info_data, |mut device_info_data| {
             remove_device(dev_info, &mut *device_info_data).unwrap_or_else(|e| {
-                warn!("failed to remove device: {}", e);
+                warn!("failed to remove device: {:#}", e);
             });
         });
 

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ impl Config<String> {`
`241`	`241`	`endpoint, e`
`242`	`242`	`);`
`243`	`243`	`} else {`
`244`		`- warn!("failed to resolve {}: {}", endpoint, e);`
	`244`	`+ warn!("failed to resolve {}: {:#}", endpoint, e);`
`245`	`245`	`}`
`246`	`246`	`None`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ pub async fn reload(wg: &Arc<WgState>, new_config: Config<SocketAddr>) -> anyhow`
`41`	`41`	`if new_fwmark != current_state.fwmark {`
`42`	`42`	`info!("setting fwmark");`
`43`	`43`	`if let Err(e) = wg.set_fwmark(new_fwmark) {`
`44`		`- warn!("failed to set fwmark to {}: {}", new_fwmark, e);`
	`44`	`+ warn!("failed to set fwmark to {}: {:#}", new_fwmark, e);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`let new_port = new_config.interface.listen_port.unwrap_or(0);`
`49`	`49`	`if current_state.listen_port != new_port {`
`50`	`50`	`info!("setting listen port");`
`51`	`51`	`if let Err(e) = wg.set_port(new_port).await {`
`52`		`- warn!("failed to set port to {}: {}", new_port, e);`
	`52`	`+ warn!("failed to set port to {}: {:#}", new_port, e);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ pub async fn ipc_server(`
`47`	`47`	`let stream = listener.accept().await?;`
`48`	`48`	`tokio::spawn(async move {`
`49`	`49`	`serve(&wg, stream).await.unwrap_or_else(\|e\| {`
`50`		`- warn!("Error serving IPC connection: {}", e);`
	`50`	`+ warn!("Error serving IPC connection: {:#}", e);`
`51`	`51`	`});`
`52`	`52`	`});`
`53`	`53`	`}`
`@@ -80,7 +80,7 @@ pub async fn ipc_server(`
`80`	`80`	`let wg = wg.clone();`
`81`	`81`	`tokio::spawn(async move {`
`82`	`82`	`serve(&wg, stream).await.unwrap_or_else(\|e\| {`
`83`		`- warn!("Error serving IPC connection: {}", e);`
	`83`	`+ warn!("Error serving IPC connection: {:#}", e);`
`84`	`84`	`});`
`85`	`85`	`});`
`86`	`86`	`}`
`@@ -168,14 +168,14 @@ async fn process_wg_set(wg: &Arc<WgState>, command: WgSetCommand) -> io::Result<`
`168`	`168`	`if let Some(p) = command.listen_port {`
`169`	`169`	`info!("set listen port");`
`170`	`170`	`wg.set_port(p).await.map_err(\|e\| {`
`171`		`- warn!("failed to set port: {}", e);`
	`171`	`+ warn!("failed to set port: {:#}", e);`
`172`	`172`	`e`
`173`	`173`	`})?;`
`174`	`174`	`}`
`175`	`175`	`if let Some(fwmark) = command.fwmark {`
`176`	`176`	`info!("set fwmark");`
`177`	`177`	`wg.set_fwmark(fwmark).map_err(\|e\| {`
`178`		`- warn!("failed to set fwmark: {}", e);`
	`178`	`+ warn!("failed to set fwmark: {:#}", e);`
`179`	`179`	`e`
`180`	`180`	`})?;`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ fn main() {`
`176`	`176`	`break;`
`177`	`177`	`}`
`178`	`178`	`Err(e) => {`
`179`		`- warn!("Error read from stdin: {}", e);`
	`179`	`+ warn!("Error read from stdin: {:#}", e);`
`180`	`180`	`break;`
`181`	`181`	`}`
`182`	`182`	`_ => (),`
Original file line number	Diff line number	Diff line change
`@@ -682,15 +682,15 @@ impl WgState {`
`682`	`682`	`self.mtu.store(mtu, Ordering::Relaxed);`
`683`	`683`	`}`
`684`	`684`	`}`
`685`		`- Err(e) => warn!("failed to get mtu: {}", e),`
	`685`	`+ Err(e) => warn!("failed to get mtu: {:#}", e),`
`686`	`686`	`}`
`687`	`687`	`}`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`/// TX. Tun -> Socket.`
`691`	`691`	`pub async fn task_tx(self: Arc<WgState>) {`
`692`	`692`	`match tun_packet_processing(self).await {`
`693`		`- Err(e) => error!("error in tx task: {}", e),`
	`693`	`+ Err(e) => error!("error in tx task: {:#}", e),`
`694`	`694`	`_ => unreachable!(),`
`695`	`695`	`}`
`696`	`696`	`}`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ unsafe impl Send for Tun {}`
`327`	`327`	`impl Drop for Tun {`
`328`	`328`	`fn drop(&mut self) {`
`329`	`329`	`self.close()`
`330`		`- .unwrap_or_else(\|e\| warn!("failed to close tun: {}", e))`
	`330`	`+ .unwrap_or_else(\|e\| warn!("failed to close tun: {:#}", e))`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ impl<'a> Interface<'a> {`
`174`	`174`
`175`	`175`	`match Interface::new(dev_info, &mut dev_info_data, &WINTUN_POOL) {`
`176`	`176`	`Err(e) => {`
`177`		`- warn!("failed Interface::new: {}", e);`
	`177`	`+ warn!("failed Interface::new: {:#}", e);`
`178`	`178`	`continue;`
`179`	`179`	`}`
`180`	`180`	`Ok(w) => {`