Skip to content

Improve error log color when use RunOpt_Dont_Abort_On_Failure #280

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

Merged
ccmywish merged 4 commits into from
Sep 13, 2025
Merged

Improve error log color when use RunOpt_Dont_Abort_On_Failure #280

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a679821
try fix color
Sep 4, 2025
5c9d385
Merge branch 'dev' into fix/#263
Sep 11, 2025
ee5453a
Merge branch 'dev' into fix/#263
Sep 12, 2025
6124949
Merge branch 'dev' into fix/#263
Sep 12, 2025
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
21 changes: 16 additions & 5 deletions src/framework/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ log_check_result (const char *check_what, const char *check_type, bool exist)


static void
log_cmd_result (bool result, int exit_status)
log_cmd_result (bool result, int exit_status, bool use_yellow_for_error)
{
char *run_msg = NULL;
char *succ_msg = NULL;
Expand All @@ -320,8 +320,17 @@ log_cmd_result (bool result, int exit_status)
{
char buf[8] = {0};
sprintf (buf, "%d", exit_status);
char *log = xy_2strcat (red (fail_msg), bdred (buf));
xy_log_brkt (red (App_Name), bdred (run_msg), log);

if (use_yellow_for_error)
{
char *log = xy_2strcat (yellow (fail_msg), bdyellow (buf));
xy_log_brkt (yellow (App_Name), bdyellow (run_msg), log);
}
else
{
char *log = xy_2strcat (red (fail_msg), bdred (buf));
xy_log_brkt (red (App_Name), bdred (run_msg), log);
}
}
}

Expand Down Expand Up @@ -1312,16 +1321,18 @@ chsrc_run (const char *cmd, int run_option)
}

int status = system (cmd);
bool use_yellow_for_error = (run_option & RunOpt_Dont_Abort_On_Failure) != 0;

if (0==status)
{
if (! (RunOpt_Dont_Notify_On_Success & run_option))
{
log_cmd_result (true, status);
log_cmd_result (true, status, use_yellow_for_error);
}
}
else
{
log_cmd_result (false, status);
log_cmd_result (false, status, use_yellow_for_error);
if (! (run_option & RunOpt_Dont_Abort_On_Failure))
{
char *msg = ENGLISH ? "Fatal error, forced end" : "关键错误，强制结束";
Expand Down