Skip to content

fix(job): scope lock to --run, fix exit code, remove dead code #238

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
icciaaron wants to merge 2 commits into
base: release/17.0
Choose a base branch
from
+18 −21
Open

fix(job): scope lock to --run, fix exit code, remove dead code #238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75999e3
fix(job): scope lock to --run, fix exit code, remove dead code
icciaaron Apr 16, 2026
1cecfde
fix(job): gate lock behind --run parameter check
icciaaron Apr 16, 2026
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
39 changes: 18 additions & 21 deletions amp_conf/htdocs/admin/libraries/Console/Job.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ protected function execute(InputInterface $input, OutputInterface $output){
$this->output = $output;
$this->input = $input;

if (!$this->lock()) {
$output->writeln('The command is already running in another process.');
return 0;
}

if($input->getOption('force')) {
$this->force = true;
}
Expand All @@ -58,22 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output){
return 0;
}

if($input->getOption('disable')) {
$this->runJobs($this->registerTasks($this->findAllJobs([$input->getOption('run')])));
return 0;
}

if($input->hasParameterOption('--run') && is_null($input->getOption('run'))) {
//run all
$this->runJobs($this->registerTasks($this->findAllJobs()));
return 0;
}

if($input->getOption('run')) {
$this->runJobs($this->registerTasks($this->findAllJobs([$input->getOption('run')])));
return 0;
}

if($input->getOption('list')) {
$table = new Table($output);
$table->setHeaders(array(_('ID'),_('Module'),_('Job'),_('Cron'),_('Next Run'),_('Action'),_("Enabled")));
Expand All @@ -94,6 +73,24 @@ protected function execute(InputInterface $input, OutputInterface $output){
return 0;
}

// Acquire lock only for --run to prevent concurrent job execution.
// Non-destructive operations (--list, --enable, --disable, help)
// do not need mutual exclusion and should not be blocked.
if($input->hasParameterOption('--run')) {
if (!$this->lock()) {
$output->writeln('<error>The command is already running in another process.</error>');
return 1;
}

if(is_null($input->getOption('run'))) {
//run all
$this->runJobs($this->registerTasks($this->findAllJobs()));
} else {
$this->runJobs($this->registerTasks($this->findAllJobs([$input->getOption('run')])));
}
return 0;
}

$this->outputHelp($input,$output);
return 0;
}
Expand Down