mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Problem behoben wodurch bei langlaufenden Cronjobs diese mehrmals
gestartet wurden
This commit is contained in:
@@ -364,6 +364,11 @@ class cronjob extends basis_db
|
||||
public function execute()
|
||||
{
|
||||
$return = true;
|
||||
if($this->running)
|
||||
{
|
||||
$this->errormsg = 'Job kann nicht ausgefuehrt werden, da er bereits laeuft';
|
||||
return false;
|
||||
}
|
||||
if($this->standalone && $this->isJobRunning())
|
||||
{
|
||||
$this->errormsg = 'Job kann nicht ausgefuehrt werden, da noch ein anderer Job laeuft';
|
||||
|
||||
@@ -40,15 +40,19 @@ foreach ($cj->result as $cronjob)
|
||||
$timestamp = $cronjob->getNextExecutionTime();
|
||||
if($timestamp && time()>=$timestamp)
|
||||
{
|
||||
//Starten des Jobs
|
||||
if($cronjob->execute())
|
||||
if(!$cronjob->running)
|
||||
{
|
||||
echo "\n".date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') executed<br>'."\n";
|
||||
echo implode($cronjob->output,"\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "\n".date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') <b>failed</b><br>'."\n";
|
||||
echo "\n".date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') execute...<br>'."\n";
|
||||
//Starten des Jobs
|
||||
if($cronjob->execute())
|
||||
{
|
||||
echo "\n".date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') executed<br>'."\n";
|
||||
echo implode($cronjob->output,"\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "\n".date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') <b>failed:'.$cronjob->errormsg.'</b><br>'."\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user