Skip to content

refactor: clean up error handling and logging in command execution #57

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
wants to merge 1 commit into
base: feature/vroom-303-fusaka-devnet-2-1
Choose a base branch
from
Open

refactor: clean up error handling and logging in command execution #57

Show file tree
Hide file tree
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
18 changes: 3 additions & 15 deletions packages/command/src/command.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,25 @@ async function executeCommandWithLogging<T>(
}

const start = performance.now();
let lastError = null;
// let lastError = null;
try {
depth += 1;
return await fn();
} catch (error: unknown) {
lastError = error;
// lastError = error;

if (error instanceof ZodError) {
formatZodErrors(error).forEach((err) => logger.error(err));
return;
}

if (error instanceof ExecaError) {
if (depth !== 0 && error instanceof ExecaError) {
logger.error(
"An error occurred while processing a nested shell command, read the logs above",
);
return;
}

if (error instanceof DevNetError) {
logger.error(
"An error occurred during the processing of the main command:",
);
logger.error(error.message);
return;
}

const err = error as any;
logger.error(
"An error occurred during the processing of the main command:",
Expand All @@ -76,10 +68,6 @@ async function executeCommandWithLogging<T>(
const end = performance.now();
logger.logFooter(`Execution time ${Math.floor(end - start)}ms`);
depth -= 1;
// eslint-disable-next-line no-unsafe-finally
if (depth === 0) return;
// eslint-disable-next-line no-unsafe-finally
if (lastError) throw lastError;
}
}

Expand Down
15 changes: 4 additions & 11 deletions packages/command/src/service/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,21 +276,14 @@ export class DevNetService<Name extends keyof DevNetServices> {

if (verboseObject.type === "duration") {
console.log();
// console.log(verboseObject.result.failed);
if (verboseObject.result.failed) {
// console.log(verboseObject.result)
// shortMessage
// const errorMessage = verboseObject.result.stderr.replaceAll(getSeparator(color, '||'), '')
// console.log(`${getSeparator(color, '||')}${chalk.red(errorMessage)}`)
// console.log(
// `${getSeparator(commandColor, "||")} ${chalk.red(verboseObject.result.shortMessage)}`,
// );
console.log(`${chalk.red(verboseObject.result.shortMessage)}`);
console.log();
}

// console.log(getSeparator(color, "||"));
// console.log();
if (verboseObject.result.stderr) {
console.log(`${chalk.red('stderr:')} ${verboseObject.result.stderr}`);
}
}

const ms = Math.floor(verboseObject.result.durationMs);
return console.log(
Expand Down