gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-06 01:27:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1463 from gitbutlerapp/fix-project-fetch-error

Browse Source 
do not log auth error
This commit is contained in:
Nikita Galaiko 2023-10-30 09:52:04 +02:00 committed by GitHub
commit a0a6b6090d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/tauri/src/watcher/handlers/fetch_project_data.rs
View File

@ -9,7 +9,7 @@ use tauri::AppHandle;
use crate::{
gb_repository, git, keys,
paths::DataDir,
project_repository,
project_repository::{self, RemoteError},
projects::{self, ProjectId},
users,
};
@ -106,7 +106,7 @@ impl HandlerInner {
.with_max_elapsed_time(Some(time::Duration::from_secs(10 * 60)))
.build();
let fetch_result = if let Err(error) = backoff::retry(policy, || {
let fetch_result = match backoff::retry(policy, || {
project_repository
.fetch(default_target.branch.remote(), &credentials)
.map_err(|err| {
@ -114,13 +114,20 @@ impl HandlerInner {
backoff::Error::transient(err)
})
}) {
tracing::error!(%project_id, ?error, will_retry = false, "failed to fetch project data");
projects::FetchResult::Error {
timestamp: *now,
error: error.to_string(),
Ok(()) => projects::FetchResult::Fetched { timestamp: *now },
Err(backoff::Error::Permanent(RemoteError::AuthError)) => {
projects::FetchResult::Error {
timestamp: *now,
error: RemoteError::AuthError.to_string(),
}
}
Err(error) => {
tracing::error!(%project_id, ?error, will_retry = false, "failed to fetch project data");
projects::FetchResult::Error {
timestamp: *now,
error: error.to_string(),
}
}
} else {
projects::FetchResult::Fetched { timestamp: *now }
};
self.projects