From 08fa49b791814fc222201517665197c0168d74fb Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Wed, 6 Aug 2025 20:46:02 +0800 Subject: [PATCH] Remove craft.log --- src/SPC/command/CraftCommand.php | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/SPC/command/CraftCommand.php b/src/SPC/command/CraftCommand.php index 5a40a25d..27b3c38f 100644 --- a/src/SPC/command/CraftCommand.php +++ b/src/SPC/command/CraftCommand.php @@ -54,17 +54,11 @@ class CraftCommand extends BuildCommand $shared_extensions = implode(',', $craft['shared-extensions'] ?? []); $libs = implode(',', $craft['libs']); - // init log - if (file_exists(WORKING_DIR . '/craft.log')) { - unlink(WORKING_DIR . '/craft.log'); - } - // craft doctor if ($craft['craft-options']['doctor']) { $retcode = $this->runCommand('doctor', '--auto-fix'); if ($retcode !== 0) { $this->output->writeln('craft doctor failed'); - $this->log("craft doctor failed with code: {$retcode}", true); return static::FAILURE; } } @@ -73,7 +67,6 @@ class CraftCommand extends BuildCommand $retcode = $this->runCommand('install-pkg', 'go-xcaddy'); if ($retcode !== 0) { $this->output->writeln('craft go-xcaddy failed'); - $this->log("craft: spc install-pkg go-xcaddy failed with code: {$retcode}", true); return static::FAILURE; } } @@ -82,7 +75,6 @@ class CraftCommand extends BuildCommand $retcode = $this->runCommand('install-pkg', 'zig'); if ($retcode !== 0) { $this->output->writeln('craft zig failed'); - $this->log("craft: spc install-pkg zig failed with code: {$retcode}", true); return static::FAILURE; } } @@ -103,7 +95,6 @@ class CraftCommand extends BuildCommand $retcode = $this->runCommand('download', ...$args); if ($retcode !== 0) { $this->output->writeln('craft download failed'); - $this->log('craft download failed with code: ' . $retcode, true); return static::FAILURE; } } @@ -115,7 +106,6 @@ class CraftCommand extends BuildCommand $retcode = $this->runCommand('build', ...$args); if ($retcode !== 0) { $this->output->writeln('craft build failed'); - $this->log('craft build failed with code: ' . $retcode, true); return static::FAILURE; } } @@ -129,31 +119,20 @@ class CraftCommand extends BuildCommand fwrite(STDERR, $buffer); } else { fwrite(STDOUT, $buffer); - $this->log($buffer); } } - private function log(string $log, bool $master_log = false): void - { - if ($master_log) { - $log = "\n[static-php-cli]> " . $log . "\n\n"; - } else { - $log = preg_replace('/\x1b\[[0-9;]*m/', '', $log); - } - file_put_contents('craft.log', $log, FILE_APPEND); - } - private function runCommand(string $cmd, ...$args): int { global $argv; if ($this->getOption('debug')) { array_unshift($args, '--debug'); } + array_unshift($args, '--preserve-log'); $prefix = PHP_SAPI === 'cli' ? [PHP_BINARY, $argv[0]] : [$argv[0]]; $env = getenv(); $process = new Process([...$prefix, $cmd, '--no-motd', ...$args], env: $env, timeout: null); - $this->log("Running: {$process->getCommandLine()}", true); if (PHP_OS_FAMILY === 'Windows') { sapi_windows_set_ctrl_handler(function () use ($process) { @@ -163,6 +142,7 @@ class CraftCommand extends BuildCommand }); } elseif (extension_loaded('pcntl')) { pcntl_signal(SIGINT, function () use ($process) { + /* @noinspection PhpComposerExtensionStubsInspection */ $process->signal(SIGINT); }); } else {