hannes/git-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve error messages during sync errors

Browse Source 
Closes #46
This commit is contained in:
Hannes Körber
2022-12-12 15:21:38 +01:00
parent 7d131bbacf
commit 38bba1472e
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/grm/main.rs
View File

@@ -38,7 +38,7 @@ fn main() {
} }
} }
Err(error) => { Err(error) => {
print_error(&format!("Error syncing trees: {}", error)); print_error(&format!("Sync error: {}", error));
process::exit(1); process::exit(1);
} }
} }
@@ -62,7 +62,7 @@ fn main() {
match provider::Github::new(filter, token, args.api_url) { match provider::Github::new(filter, token, args.api_url) {
Ok(provider) => provider, Ok(provider) => provider,
Err(error) => { Err(error) => {
print_error(&format!("Error: {}", error)); print_error(&format!("Sync error: {}", error));
process::exit(1); process::exit(1);
} }
} }
@@ -76,7 +76,7 @@ fn main() {
match provider::Gitlab::new(filter, token, args.api_url) { match provider::Gitlab::new(filter, token, args.api_url) {
Ok(provider) => provider, Ok(provider) => provider,
Err(error) => { Err(error) => {
print_error(&format!("Error: {}", error)); print_error(&format!("Sync error: {}", error));
process::exit(1); process::exit(1);
} }
} }
@@ -112,13 +112,13 @@ fn main() {
} }
} }
Err(error) => { Err(error) => {
print_error(&format!("Error syncing trees: {}", error)); print_error(&format!("Sync error: {}", error));
process::exit(1); process::exit(1);
} }
} }
} }
Err(error) => { Err(error) => {
print_error(&format!("Error: {}", error)); print_error(&format!("Sync error: {}", error));
process::exit(1); process::exit(1);
} }
} }

10
src/provider/mod.rs
View File

@@ -270,11 +270,15 @@ pub trait Provider {
} }
for group in &self.filter().groups { for group in &self.filter().groups {
let group_projects = self let group_projects = self.get_group_projects(group).map_err(|error| {
.get_group_projects(group) format!(
.map_err(|error| match error { "group \"{}\": {}",
group,
match error {
ApiErrorResponse::Json(x) => x.to_string(), ApiErrorResponse::Json(x) => x.to_string(),
ApiErrorResponse::String(s) => s, ApiErrorResponse::String(s) => s,
}
)
})?; })?;
for group_project in group_projects { for group_project in group_projects {
let mut already_present = false; let mut already_present = false;