From 1009b80266dbbe202d50fceec373f03b740ad14e Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 20 Dec 2024 17:11:25 +0100 Subject: [PATCH] chore(gateway): provide more context on startup failure (#7564) --- rust/gateway/src/main.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rust/gateway/src/main.rs b/rust/gateway/src/main.rs index 74bd6f74a..a9c080876 100644 --- a/rust/gateway/src/main.rs +++ b/rust/gateway/src/main.rs @@ -76,7 +76,8 @@ fn main() -> ExitCode { } async fn try_main(cli: Cli, telemetry: &mut Telemetry) -> Result { - firezone_logging::setup_global_subscriber(layer::Identity::default())?; + firezone_logging::setup_global_subscriber(layer::Identity::default()) + .context("Failed to set up logging")?; let firezone_id = get_firezone_id(cli.firezone_id).await .context("Couldn't read FIREZONE_ID or write it to disk: Please provide it through the env variable or provide rw access to /var/lib/firezone/")?; @@ -87,7 +88,8 @@ async fn try_main(cli: Cli, telemetry: &mut Telemetry) -> Result { &SecretString::new(cli.token), firezone_id, cli.firezone_name, - )?; + ) + .context("Failed to construct URL for logging into portal")?; let mut tunnel = GatewayTunnel::new(Arc::new(tcp_socket_factory), Arc::new(udp_socket_factory)); let portal = PhoenixChannel::disconnected( @@ -106,8 +108,11 @@ async fn try_main(cli: Cli, telemetry: &mut Telemetry) -> Result { let (sender, receiver) = mpsc::channel::(10); - let mut tun_device_manager = TunDeviceManager::new(ip_packet::MAX_IP_SIZE, cli.tun_threads)?; - let tun = tun_device_manager.make_tun()?; + let mut tun_device_manager = TunDeviceManager::new(ip_packet::MAX_IP_SIZE, cli.tun_threads) + .context("Failed to create TUN device manager")?; + let tun = tun_device_manager + .make_tun() + .context("Failed to create TUN device")?; tunnel.set_tun(Box::new(tun)); tokio::spawn(update_device_task(tun_device_manager, receiver));