Skip to content

Commit 107291f

Browse files
author
koubaalo
committed
[#20273] Improve further error handling. Attempt fix obsolete mappings
1 parent 49f6406 commit 107291f

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/jobs/remove_obsolete_mappings_job.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ export class RemoveObsoleteMappingsJob extends SyncJob {
106106
// service object is missing, it is ok to delete the mapping
107107
operationOk = true;
108108
} else {
109+
operationOk &&= ex.response.ok;
109110
if (syncedService.errors.length > 0) {
110111
this._jobLog.errors.push(syncedService.errors[syncedService.errors.length - 1]);
111112
}

src/synced_services/redmine/redmine_synced_service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,18 +858,21 @@ export class RedmineSyncedService implements SyncedService {
858858
} else if (ex.response) {
859859
const message = `${extraContext.functionName} failed with a response code ${ex.response.statusCode}`;
860860
error.specification += " - " + message;
861-
extraContext.responseErrors = ex.response.body?.errors ?? [];
861+
extraContext.responseErrors = !ex.response.body?.errors ? [ex.message] : ex.response.body.errors;
862+
extraContext.responseErrors.push(ex.response.statusCode)
862863
error.data = extraContext;
863864

864865
this._sentryService.logRedmineError(this._projectsUri, message, context);
865866
} else {
866867
const message = `${extraContext.functionName} failed without a response`;
867868
error.specification += " - " + message;
869+
extraContext.responseErrors = [ex.message];
868870
error.data = extraContext;
869871

870872
this._sentryService.logRedmineError(this._projectsUri, message, context);
871873
}
872874

875+
873876
this.errors.push(error);
874877
}
875878

src/synced_services/toggl/toggl_synced_service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,13 +670,15 @@ export class TogglTrackSyncedService implements SyncedService {
670670
const message = `${extraContext.functionName} failed with a response code ${ex.response.statusCode}`;
671671
error.specification += " - " + message;
672672
error.data = extraContext;
673-
error.data.responseErrors = !ex.response.text ? [] : [ex.response.text];
673+
error.data.responseErrors = !ex.response.text ? [ex.response.statusCode] : [ex.response.text, ex.response.statusCode];
674674

675675
this._sentryService.logTogglError(message, context);
676676
} else {
677677
const message = `${extraContext.functionName} failed without a response`;
678678
error.specification += " - " + message;
679+
extraContext.responseErrors = [ex.message];
679680
error.data = extraContext;
681+
680682
this._sentryService.logTogglError(message, context);
681683
}
682684

0 commit comments

Comments
 (0)