Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: moved the cli serve-web cache seeding to ConnectionManager initialization from get_latest_release

Browse Source
This commit is contained in:
Ritam
2024-08-15 18:55:06 +05:30
parent 2ed4fb19e6
commit 785aaa3fdf
1 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cli/src/commands/serve_web.rs
View File

@@ -538,18 +538,47 @@ impl ConnectionManager {
pub fn new(ctx: &CommandContext, platform: Platform, args: ServeWebArgs) -> Arc<Self> {
let base_path = normalize_base_path(args.server_base_path.as_deref().unwrap_or_default());
let cache = DownloadCache::load(ctx.paths.web_server_storage());
let latest_version: tokio::sync::Mutex<Option<(Instant, Release)>>;
let target_kind = TargetKind::Web;
//Set the instant to now minus the RELEASE_CACHE_SECS
//This allows the service to skip use of the cache for the first run
let instant = Instant::now() - Duration::from_secs(RELEASE_CACHE_SECS);
let quality = VSCODE_CLI_QUALITY
.map_or(Quality::Stable, |q| {
match Quality::try_from(q) {
Ok(q) => q,
Err(_) => Quality::Stable
}
});
if let Some(latest_commit) = cache.get().first() {
let release = Release {
name: String::from("0.0.0"), // Version information not stored on cache
commit: latest_commit.clone(),
platform,
target: target_kind,
quality
};
latest_version = tokio::sync::Mutex::new(Some((instant, release)));
} else {
latest_version = tokio::sync::Mutex::default();
}
Arc::new(Self {
platform,
args,
base_path,
log: ctx.log.clone(),
cache: DownloadCache::load(ctx.paths.web_server_storage()),
cache,
update_service: UpdateService::new(
ctx.log.clone(),
Arc::new(ReqwestSimpleHttp::with_client(ctx.http.clone())),
),
state: ConnectionStateMap::default(),
latest_version: tokio::sync::Mutex::default(),
latest_version,
})
}
@@ -591,30 +620,12 @@ impl ConnectionManager {
.map_err(|e| CodeError::UpdateCheckFailed(e.to_string()));
// If the update service is unavailable and we have stale data, use that
if let (Err(e), Some((_, previous))) = (&release, &*latest) {
if let (Err(e), Some((_, previous))) = (&release, latest.clone()) {
warning!(self.log, "error getting latest release, using stale: {}", e);
*latest = Some((now, previous.clone()));
return Ok(previous.clone());
}
// If the update service is unavailable and we have cached data, use that
if let Err(e) = &release {
warning!(self.log, "error getting latest release: {}", e);
if let Some(latest_commit) = self.cache.get().first() {
warning!(self.log, "using latest release available from cache");
let release = Release {
name: String::from("0.0.0"), // Version information not stored on cache
commit: latest_commit.clone(),
platform: self.platform,
target: target_kind,
quality
};
*latest = Some((now, release.clone()));
return Ok(release)
}
}
let release = release?;
debug!(self.log, "refreshed latest release: {}", release);
*latest = Some((now, release.clone()));