Rewrite Process Model/Core

This commit is contained in:
Philipp 2020-09-15 18:16:44 +02:00
parent fe545cef74
commit cdb61be06f
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
6 changed files with 82 additions and 60 deletions

View file

@ -22,6 +22,7 @@
namespace Friendica\Core;
use Friendica\Core;
use Friendica\Core\Process as ProcessAlias;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Process;
@ -72,7 +73,7 @@ class Worker
}
// We now start the process. This is done after the load check since this could increase the load.
self::startProcess();
DI::process()->start();
// Kill stale processes every 5 minutes
$last_cleanup = DI::config()->get('system', 'worker_last_cleaned', 0);
@ -1092,7 +1093,7 @@ class Worker
if (self::tooMuchWorkers()) {
// Cleaning dead processes
self::killStaleWorkers();
Process::deleteInactive();
DI::modelProcess()->deleteInactive();
return;
}
@ -1360,31 +1361,6 @@ class Worker
return true;
}
/**
* Log active processes into the "process" table
*/
public static function startProcess()
{
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
$command = basename($trace[0]['file']);
Process::deleteInactive();
Process::insert($command);
}
/**
* Remove the active process from the "process" table
*
* @return bool
* @throws \Exception
*/
public static function endProcess()
{
return Process::deleteByPid();
}
/**
* Set the flag if some job is waiting
*