groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-03-10 09:19:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Extracted logic used by both BackupManager and UpdateExecutor to new service

Browse source
This commit is contained in:
Jan Böhmer 2026-02-02 19:48:27 +01:00
parent 68ff0721ce
commit 1ccc3ad440
3 changed files with 89 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Services/System/UpdateExecutor.php
View file

@ -46,6 +46,7 @@ class UpdateExecutor
private array $steps = [];
private ?string $currentLogFile = null;
private CommandRunHelper $commandRunHelper;
public function __construct(
#[Autowire(param: 'kernel.project_dir')]
@ -58,6 +59,7 @@ class UpdateExecutor
#[Autowire(param: 'app.debug_mode')]
private readonly bool $debugMode = false,
) {
$this->commandRunHelper = new CommandRunHelper($this);
}
/**
@ -516,36 +518,7 @@ class UpdateExecutor
*/
private function runCommand(array $command, string $description, int $timeout = 120): string
{
$process = new Process($command, $this->project_dir);
$process->setTimeout($timeout);
// Set environment variables needed for Composer and other tools
// This is especially important when running as www-data which may not have HOME set
// We inherit from current environment and override/add specific variables
$currentEnv = getenv();
if (!is_array($currentEnv)) {
$currentEnv = [];
}
$env = array_merge($currentEnv, [
'HOME' => $this->project_dir,
'COMPOSER_HOME' => $this->project_dir . '/var/composer',
'PATH' => getenv('PATH') ?: '/usr/local/bin:/usr/bin:/bin',
]);
$process->setEnv($env);
$output = '';
$process->run(function ($type, $buffer) use (&$output) {
$output .= $buffer;
});
if (!$process->isSuccessful()) {
$errorOutput = $process->getErrorOutput() ?: $process->getOutput();
throw new \RuntimeException(
sprintf('%s failed: %s', $description, trim($errorOutput))
);
}
return $output;
return $this->commandRunHelper->runCommand($command, $description, $timeout);
}
/**