Adjust shell debug log

This commit is contained in:
crazywhalecc 2024-07-09 00:44:03 +08:00 committed by Jerry Ma
parent 778cd7b2c7
commit aad260c31e
2 changed files with 5 additions and 2 deletions

View File

@ -41,6 +41,7 @@ class UnixShell
{
/* @phpstan-ignore-next-line */
logger()->info(ConsoleColor::yellow('[EXEC] ') . ConsoleColor::green($cmd));
logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']);
if ($this->cd !== null) {
$cmd = 'cd ' . escapeshellarg($this->cd) . ' && ' . $cmd;
}
@ -57,8 +58,10 @@ class UnixShell
/* @phpstan-ignore-next-line */
logger()->info(ConsoleColor::blue('[EXEC] ') . ConsoleColor::green($cmd));
} else {
logger()->debug('Running command with result: ' . $cmd);
/* @phpstan-ignore-next-line */
logger()->debug(ConsoleColor::blue('[EXEC] ') . ConsoleColor::gray($cmd));
}
logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']);
exec($cmd, $out, $code);
return [$code, $out];
}

View File

@ -140,7 +140,7 @@ function f_passthru(string $cmd): ?bool
if ($danger) {
logger()->notice('Running dangerous command: ' . $cmd);
} else {
logger()->debug('Running command with direct output: ' . $cmd);
logger()->debug('[PASSTHRU] ' . $cmd);
}
$ret = passthru($cmd, $code);
if ($code !== 0) {