fix(agent): defer driver version gate
This commit is contained in:
1 parent
47f87e0361
commit
d2938478f4
2 files changed
+4
-8
No files matched your search
@@ -8,8 +8,8 @@ use dbx_core::agent_manager::{
|
|||||||
DEFAULT_JRE_KEY,
|
DEFAULT_JRE_KEY,
|
||||||
};
|
};
|
||||||
use dbx_core::agent_service::{
|
use dbx_core::agent_service::{
|
||||||
build_agent_list, download_temp_path, ensure_driver_app_version, fetch_registry, find_local_agent_jar,
|
build_agent_list, download_temp_path, fetch_registry, find_local_agent_jar, github_url_to_r2_path,
|
||||||
github_url_to_r2_path, install_local_agent, invalidate_registry_cache, verify_and_replace_download,
|
install_local_agent, invalidate_registry_cache, verify_and_replace_download,
|
||||||
};
|
};
|
||||||
use futures::Stream;
|
use futures::Stream;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
@@ -215,8 +215,6 @@ async fn install_agent_from_registry(
|
|||||||
}
|
}
|
||||||
return Err(format!("Unknown driver type: {db_type}"));
|
return Err(format!("Unknown driver type: {db_type}"));
|
||||||
};
|
};
|
||||||
ensure_driver_app_version(db_type, driver, env!("CARGO_PKG_VERSION"))?;
|
|
||||||
|
|
||||||
let jre_key = &driver.jre;
|
let jre_key = &driver.jre;
|
||||||
let needs_jre = am.load_state().java_runtime.mode == JavaRuntimeMode::Managed && !am.is_jre_installed(jre_key);
|
let needs_jre = am.load_state().java_runtime.mode == JavaRuntimeMode::Managed && !am.is_jre_installed(jre_key);
|
||||||
if needs_jre {
|
if needs_jre {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ use dbx_core::agent_manager::{
|
|||||||
AgentDriverInfo, AgentManager, InstalledDriver, JavaRuntimeConfig, JavaRuntimeMode, DEFAULT_JRE_KEY,
|
AgentDriverInfo, AgentManager, InstalledDriver, JavaRuntimeConfig, JavaRuntimeMode, DEFAULT_JRE_KEY,
|
||||||
};
|
};
|
||||||
use dbx_core::agent_service::{
|
use dbx_core::agent_service::{
|
||||||
build_agent_list, download_temp_path, ensure_driver_app_version, fetch_registry, find_local_agent_jar,
|
build_agent_list, download_temp_path, fetch_registry, find_local_agent_jar, github_url_to_r2_path,
|
||||||
github_url_to_r2_path, install_local_agent, invalidate_registry_cache, verify_and_replace_download,
|
install_local_agent, invalidate_registry_cache, verify_and_replace_download,
|
||||||
};
|
};
|
||||||
use dbx_core::connection::AppState;
|
use dbx_core::connection::AppState;
|
||||||
|
|
||||||
@@ -49,7 +49,6 @@ pub async fn install_agent(
|
|||||||
}
|
}
|
||||||
return Err(format!("Unknown driver type: {db_type}"));
|
return Err(format!("Unknown driver type: {db_type}"));
|
||||||
};
|
};
|
||||||
ensure_driver_app_version(&db_type, driver, env!("CARGO_PKG_VERSION"))?;
|
|
||||||
let jre_key = &driver.jre;
|
let jre_key = &driver.jre;
|
||||||
let needs_jre = am.load_state().java_runtime.mode == JavaRuntimeMode::Managed && !am.is_jre_installed(jre_key);
|
let needs_jre = am.load_state().java_runtime.mode == JavaRuntimeMode::Managed && !am.is_jre_installed(jre_key);
|
||||||
|
|
||||||
@@ -138,7 +137,6 @@ pub async fn upgrade_all_agents(app: tauri::AppHandle, state: State<'_, Arc<AppS
|
|||||||
let current = (i + 1) as u32;
|
let current = (i + 1) as u32;
|
||||||
let db_type = &agent.db_type;
|
let db_type = &agent.db_type;
|
||||||
let driver = registry.drivers.get(db_type).ok_or_else(|| format!("Unknown driver type: {db_type}"))?;
|
let driver = registry.drivers.get(db_type).ok_or_else(|| format!("Unknown driver type: {db_type}"))?;
|
||||||
ensure_driver_app_version(db_type, driver, env!("CARGO_PKG_VERSION"))?;
|
|
||||||
let jre_key = &driver.jre;
|
let jre_key = &driver.jre;
|
||||||
let needs_jre = am.load_state().java_runtime.mode == JavaRuntimeMode::Managed && !am.is_jre_installed(jre_key);
|
let needs_jre = am.load_state().java_runtime.mode == JavaRuntimeMode::Managed && !am.is_jre_installed(jre_key);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user