Skip to content

fix(dgw): ignore bad agent_tunnel.db when tunnel is off #2071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
irvingouj@Devolutions (irvingoujAtDevolution) wants to merge 1 commit into from
Closed

fix(dgw): ignore bad agent_tunnel.db when tunnel is off #2071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions devolutions-gateway/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,18 @@ async fn spawn_tasks(conf_handle: ConfHandle) -> anyhow::Result<Tasks> {
let monitoring_state = Arc::new(network_monitor::State::new(Arc::new(filesystem_monitor_config_cache))?);

let data_dir = config::get_data_dir();
agent_tunnel_libsql::import_2026_3_0_database(&data_dir)
let import_result = agent_tunnel_libsql::import_2026_3_0_database(&data_dir)
.await
.context("failed to import the 2026.3.0 agent tunnel database")?;
.context("failed to import the 2026.3.0 agent tunnel database");
match import_result {
Ok(()) => {}
Err(error) if conf.agent_tunnel.enabled => return Err(error),
// The agent tunnel is off, so a bad old file must not stop the Gateway.
Err(error) => warn!(
error = format!("{error:#}"),
"Failed to import the 2026.3.0 agent tunnel database, continuing because the agent tunnel is disabled"
Comment on lines +284 to +288
),
}
let gateway_db = gateway_db::GatewayDb::open(&data_dir)
.await
.context("failed to open the gateway database")?;
Expand Down
Loading