Skip to content

fix(desktop): guard ErrorService when logService is unavailable #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ORuessel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(desktop): guard ErrorService when logService is unavailable #617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions packages/desktop-app/src/app/services/middleware/error.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,21 @@ export class ErrorService implements ErrorHandler {
console.log("ERROREEE:", error);

error = (error as any).rejection ? (error as any).rejection : error;
const logService = this.injector.get(AppProviderService).logService;

if (error instanceof LoggedException) {
logService.log(error);
} else {
logService.log(new LoggedEntry(error.message, this, LogLevel.error, true, error.stack));
try {
const logService = this.injector.get(AppProviderService)?.logService;
if (!logService || typeof logService.log !== "function") {
console.error("[Leapp] ErrorService: logService unavailable; original error:", error);
return;
}

if (error instanceof LoggedException) {
logService.log(error);
} else {
logService.log(new LoggedEntry(error.message, this, LogLevel.error, true, error.stack));
}
} catch (secondaryError) {
console.error("[Leapp] ErrorService.handleError failed; original error:", error, secondaryError);
}
}
}
Loading