bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Log function

Browse source 
implement log() function.
This commit is contained in:
Adam Magness 2018-10-29 17:20:46 -04:00
commit 14fde5dc9b
122 changed files with 1280 additions and 1161 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Core/Addon.php
View file

@ -6,6 +6,7 @@ namespace Friendica\Core;
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Database\DBA;
/**
@ -75,7 +76,7 @@ class Addon extends BaseObject
*/
public static function uninstall($addon)
{
logger("Addons: uninstalling " . $addon);
Logger::log("Addons: uninstalling " . $addon);
DBA::delete('addon', ['name' => $addon]);
@include_once('addon/' . $addon . '/' . $addon . '.php');
@ -100,7 +101,7 @@ class Addon extends BaseObject
if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) {
return false;
}
logger("Addons: installing " . $addon);
Logger::log("Addons: installing " . $addon);
$t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
@include_once('addon/' . $addon . '/' . $addon . '.php');
if (function_exists($addon . '_install')) {
@ -125,7 +126,7 @@ class Addon extends BaseObject
}
return true;
} else {
logger("Addons: FAILED installing " . $addon);
Logger::log("Addons: FAILED installing " . $addon);
return false;
}
}
@ -155,7 +156,7 @@ class Addon extends BaseObject
$t = @filemtime($fname);
foreach ($installed as $i) {
if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {
logger('Reloading addon: ' . $i['name']);
Logger::log('Reloading addon: ' . $i['name']);
@include_once($fname);
if (function_exists($addon . '_uninstall')) {

7
src/Core/Authentication.php
View file

@ -9,6 +9,7 @@ use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
@ -153,10 +154,10 @@ class Authentication extends BaseObject
}
if ($login_initial) {
logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
Logger::log('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
}
if ($login_refresh) {
logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
Logger::log('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
}
$contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
@ -184,7 +185,7 @@ class Authentication extends BaseObject
* The week ensures that sessions will expire after some inactivity.
*/
if (!empty($_SESSION['remember'])) {
logger('Injecting cookie for remembered user ' . $a->user['nickname']);
Logger::log('Injecting cookie for remembered user ' . $a->user['nickname']);
self::setCookie(604800, $user_record);
unset($_SESSION['remember']);
}

5
src/Core/Cache/MemcachedCacheDriver.php
View file

@ -3,6 +3,7 @@
namespace Friendica\Core\Cache;
use Friendica\Core\Cache;
use Friendica\Core\Logger;
use Exception;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -64,7 +65,7 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
if ($this->memcached->getResultCode() == Memcached::RES_SUCCESS) {
return $this->filterArrayKeysByPrefix($keys, $prefix);
} else {
logger('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
Logger::log('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
return [];
}
}
@ -83,7 +84,7 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
$return = $value;
} else {
logger('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
Logger::log('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
}
return $return;

3
src/Core/L10n.php
View file

@ -6,6 +6,7 @@ namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Core\Logger;
use Friendica\Core\System;
require_once 'boot.php';
@ -271,7 +272,7 @@ class L10n extends BaseObject
public static function tt($singular, $plural, $count)
{
if (!is_numeric($count)) {
logger('Non numeric count called by ' . System::callstack(20));
Logger::log('Non numeric count called by ' . System::callstack(20));
}
if (!self::$lang) {

3
src/Core/Lock.php
View file

@ -7,6 +7,7 @@ namespace Friendica\Core;
* @brief Functions for preventing parallel execution of functions
*/
use Friendica\Core\Logger;
use Friendica\Core\Cache\CacheDriverFactory;
use Friendica\Core\Cache\IMemoryCacheDriver;
@ -83,7 +84,7 @@ class Lock
}
return;
} catch (\Exception $exception) {
logger('Using Cache driver for locking failed: ' . $exception->getMessage());
Logger::log('Using Cache driver for locking failed: ' . $exception->getMessage());
}
}

6
src/Core/Logger.php
View file

@ -24,7 +24,7 @@ class Logger
* @param string $msg
* @param int $level
*/
public static function logger($msg, $level = LOGGER_INFO)
public static function log($msg, $level = LOGGER_INFO)
{
$a = get_app();
global $LOGGER_LEVELS;
@ -81,7 +81,7 @@ class Logger
/**
* @brief An alternative logger for development.
* Works largely as logger() but allows developers
* Works largely as log() but allows developers
* to isolate particular elements they are targetting
* personally without background noise
*
@ -97,7 +97,7 @@ class Logger
* @param string $msg
* @param int $level
*/
public static function dlogger($msg, $level = LOGGER_INFO)
public static function devLog($msg, $level = LOGGER_INFO)
{
$a = get_app();

3
src/Core/NotificationsManager.php
View file

@ -9,6 +9,7 @@ namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@ -358,7 +359,7 @@ class NotificationsManager extends BaseObject
break;
}
/// @todo Check if this part here is used at all
logger('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG);
Logger::log('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG);
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
$obj = XML::parseString($xmlhead . $it['object']);

3
src/Core/Session/CacheSessionHandler.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Core\Session;
use Friendica\BaseObject;
use Friendica\Core\Cache;
use Friendica\Core\Logger;
use Friendica\Core\Session;
use SessionHandlerInterface;
@ -33,7 +34,7 @@ class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
Session::$exists = true;
return $data;
}
logger("no data for session $session_id", LOGGER_TRACE);
Logger::log("no data for session $session_id", LOGGER_TRACE);
return '';
}

3
src/Core/Session/DatabaseSessionHandler.php
View file

@ -3,6 +3,7 @@
namespace Friendica\Core\Session;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Core\Session;
use Friendica\Database\DBA;
use SessionHandlerInterface;
@ -34,7 +35,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
Session::$exists = true;
return $session['data'];
}
logger("no data for session $session_id", LOGGER_TRACE);
Logger::log("no data for session $session_id", LOGGER_TRACE);
return '';
}

5
src/Core/System.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\XML;
@ -100,7 +101,7 @@ class System extends BaseObject
}
if ($st) {
logger('xml_status returning non_zero: ' . $st . " message=" . $message);
Logger::log('xml_status returning non_zero: ' . $st . " message=" . $message);
}
header("Content-type: text/xml");
@ -134,7 +135,7 @@ class System extends BaseObject
$err = 'OK';
}
logger('http_status_exit ' . $val);
Logger::log('http_status_exit ' . $val);
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
if (isset($description["title"])) {

7
src/Core/Theme.php
View file

@ -6,6 +6,7 @@
namespace Friendica\Core;
use Friendica\Core\Logger;
use Friendica\Core\System;
require_once 'boot.php';
@ -106,7 +107,7 @@ class Theme
// install and uninstall theme
public static function uninstall($theme)
{
logger("Addons: uninstalling theme " . $theme);
Logger::log("Addons: uninstalling theme " . $theme);
include_once "view/theme/$theme/theme.php";
if (function_exists("{$theme}_uninstall")) {
@ -123,7 +124,7 @@ class Theme
return false;
}
logger("Addons: installing theme $theme");
Logger::log("Addons: installing theme $theme");
include_once "view/theme/$theme/theme.php";
@ -132,7 +133,7 @@ class Theme
$func();
return true;
} else {
logger("Addons: FAILED installing theme $theme");
Logger::log("Addons: FAILED installing theme $theme");
return false;
}
}

21
src/Core/UserImport.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Core;
use Friendica\App;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model\Photo;
@ -37,7 +38,7 @@ class UserImport
private static function checkCols($table, &$arr)
{
$query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
logger("uimport: $query", LOGGER_DEBUG);
Logger::log("uimport: $query", LOGGER_DEBUG);
$r = q($query);
$tcols = [];
// get a plain array of column names
@ -68,7 +69,7 @@ class UserImport
$cols = implode("`,`", array_map(['Friendica\Database\DBA', 'escape'], array_keys($arr)));
$vals = implode("','", array_map(['Friendica\Database\DBA', 'escape'], array_values($arr)));
$query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
logger("uimport: $query", LOGGER_TRACE);
Logger::log("uimport: $query", LOGGER_TRACE);
if (self::IMPORT_DEBUG) {
return true;
@ -85,7 +86,7 @@ class UserImport
*/
public static function importAccount(App $a, $file)
{
logger("Start user import from " . $file['tmp_name']);
Logger::log("Start user import from " . $file['tmp_name']);
/*
STEPS
1. checks
@ -143,7 +144,7 @@ class UserImport
// import user
$r = self::dbImportAssoc('user', $account['user']);
if ($r === false) {
logger("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
notice(L10n::t("User creation error"));
return;
}
@ -161,7 +162,7 @@ class UserImport
$profile['uid'] = $newuid;
$r = self::dbImportAssoc('profile', $profile);
if ($r === false) {
logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
info(L10n::t("User profile creation error"));
DBA::delete('user', ['uid' => $newuid]);
return;
@ -199,7 +200,7 @@ class UserImport
$contact['uid'] = $newuid;
$r = self::dbImportAssoc('contact', $contact);
if ($r === false) {
logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
$errorcount++;
} else {
$contact['newid'] = self::lastInsertId();
@ -213,7 +214,7 @@ class UserImport
$group['uid'] = $newuid;
$r = self::dbImportAssoc('group', $group);
if ($r === false) {
logger("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
} else {
$group['newid'] = self::lastInsertId();
}
@ -238,7 +239,7 @@ class UserImport
if ($import == 2) {
$r = self::dbImportAssoc('group_member', $group_member);
if ($r === false) {
logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
}
}
}
@ -256,7 +257,7 @@ class UserImport
);
if ($r === false) {
logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
}
}
@ -264,7 +265,7 @@ class UserImport
$pconfig['uid'] = $newuid;
$r = self::dbImportAssoc('pconfig', $pconfig);
if ($r === false) {
logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
Logger::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
}
}

81
src/Core/Worker.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
@ -42,7 +43,7 @@ class Worker
// At first check the maximum load. We shouldn't continue with a high load
if ($a->isMaxLoadReached()) {
logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
Logger::log('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
return;
}
@ -58,25 +59,25 @@ class Worker
// Count active workers and compare them with a maximum value that depends on the load
if (self::tooMuchWorkers()) {
logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG);
Logger::log('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG);
return;
}
// Do we have too few memory?
if ($a->isMinMemoryReached()) {
logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG);
Logger::log('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG);
return;
}
// Possibly there are too much database connections
if (self::maxConnectionsReached()) {
logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG);
Logger::log('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG);
return;
}
// Possibly there are too much database processes that block the system
if ($a->isMaxProcessesReached()) {
logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG);
Logger::log('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG);
return;
}
@ -99,7 +100,7 @@ class Worker
// The work will be done
if (!self::execute($entry)) {
logger('Process execution failed, quitting.', LOGGER_DEBUG);
Logger::log('Process execution failed, quitting.', LOGGER_DEBUG);
return;
}
@ -117,14 +118,14 @@ class Worker
$stamp = (float)microtime(true);
// Count active workers and compare them with a maximum value that depends on the load
if (self::tooMuchWorkers()) {
logger('Active worker limit reached, quitting.', LOGGER_DEBUG);
Logger::log('Active worker limit reached, quitting.', LOGGER_DEBUG);
Lock::release('worker');
return;
}
// Check free memory
if ($a->isMinMemoryReached()) {
logger('Memory limit reached, quitting.', LOGGER_DEBUG);
Logger::log('Memory limit reached, quitting.', LOGGER_DEBUG);
Lock::release('worker');
return;
}
@ -134,7 +135,7 @@ class Worker
// Quit the worker once every 5 minutes
if (time() > ($starttime + 300)) {
logger('Process lifetime reached, quitting.', LOGGER_DEBUG);
Logger::log('Process lifetime reached, quitting.', LOGGER_DEBUG);
return;
}
}
@ -143,7 +144,7 @@ class Worker
if (Config::get('system', 'worker_daemon_mode', false)) {
self::IPCSetJobState(false);
}
logger("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", LOGGER_DEBUG);
Logger::log("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", LOGGER_DEBUG);
}
/**
@ -213,19 +214,19 @@ class Worker
// Quit when in maintenance
if (Config::get('system', 'maintenance', false, true)) {
logger("Maintenance mode - quit process ".$mypid, LOGGER_DEBUG);
Logger::log("Maintenance mode - quit process ".$mypid, LOGGER_DEBUG);
return false;
}
// Constantly check the number of parallel database processes
if ($a->isMaxProcessesReached()) {
logger("Max processes reached for process ".$mypid, LOGGER_DEBUG);
Logger::log("Max processes reached for process ".$mypid, LOGGER_DEBUG);
return false;
}
// Constantly check the number of available database connections to let the frontend be accessible at any time
if (self::maxConnectionsReached()) {
logger("Max connection reached for process ".$mypid, LOGGER_DEBUG);
Logger::log("Max connection reached for process ".$mypid, LOGGER_DEBUG);
return false;
}
@ -270,7 +271,7 @@ class Worker
}
if (!validate_include($include)) {
logger("Include file ".$argv[0]." is not valid!");
Logger::log("Include file ".$argv[0]." is not valid!");
DBA::delete('workerqueue', ['id' => $queue["id"]]);
return true;
}
@ -302,7 +303,7 @@ class Worker
}
self::$db_duration = (microtime(true) - $stamp);
} else {
logger("Function ".$funcname." does not exist");
Logger::log("Function ".$funcname." does not exist");
DBA::delete('workerqueue', ['id' => $queue["id"]]);
}
@ -328,7 +329,7 @@ class Worker
$new_process_id = System::processID("wrk");
logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
$stamp = (float)microtime(true);
@ -378,7 +379,7 @@ class Worker
* The execution time is the productive time.
* By changing parameters like the maximum number of workers we can check the effectivness.
*/
logger(
Logger::log(
'DB: '.number_format(self::$db_duration, 2).
' - Lock: '.number_format(self::$lock_duration, 2).
' - Rest: '.number_format($up_duration - self::$db_duration - self::$lock_duration, 2).
@ -389,16 +390,16 @@ class Worker
self::$lock_duration = 0;
if ($duration > 3600) {
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG);
Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG);
} elseif ($duration > 600) {
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
} elseif ($duration > 300) {
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
} elseif ($duration > 120) {
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
}
logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds. Process PID: ".$new_process_id);
Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds. Process PID: ".$new_process_id);
// Write down the performance values into the log
if (Config::get("system", "profiler")) {
@ -453,7 +454,7 @@ class Worker
}
}
logger(
Logger::log(
"ID ".$queue["id"].": ".$funcname.": ".sprintf(
"DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
number_format($a->performance["database"] - $a->performance["database_write"], 2),
@ -474,7 +475,7 @@ class Worker
$cooldown = Config::get("system", "worker_cooldown", 0);
if ($cooldown > 0) {
logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
sleep($cooldown);
}
}
@ -518,12 +519,12 @@ class Worker
$used = DBA::numRows($r);
DBA::close($r);
logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
Logger::log("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
$level = ($used / $max) * 100;
if ($level >= $maxlevel) {
logger("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
Logger::log("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
return true;
}
}
@ -546,14 +547,14 @@ class Worker
if ($used == 0) {
return false;
}
logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
Logger::log("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
$level = $used / $max * 100;
if ($level < $maxlevel) {
return false;
}
logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
Logger::log("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
return true;
}
@ -594,7 +595,7 @@ class Worker
// How long is the process already running?
$duration = (time() - strtotime($entry["executed"])) / 60;
if ($duration > $max_duration) {
logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now.");
Logger::log("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now.");
posix_kill($entry["pid"], SIGTERM);
// We killed the stale process.
@ -614,7 +615,7 @@ class Worker
['id' => $entry["id"]]
);
} else {
logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
Logger::log("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
}
}
}
@ -697,16 +698,16 @@ class Worker
$high_running = self::processWithPriorityActive($top_priority);
if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) {
logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
Logger::log("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
$queues = $active + 1;
}
}
logger("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $entries . $processlist . " - maximum: " . $queues . "/" . $maxqueues, LOGGER_DEBUG);
Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $entries . $processlist . " - maximum: " . $queues . "/" . $maxqueues, LOGGER_DEBUG);
// Are there fewer workers running as possible? Then fork a new one.
if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {
logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
Logger::log("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
if (Config::get('system', 'worker_daemon_mode', false)) {
self::IPCSetJobState(true);
} else {
@ -779,11 +780,11 @@ class Worker
++$high;
}
}
logger("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, LOGGER_DEBUG);
Logger::log("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, LOGGER_DEBUG);
$passing_slow = (($high/count($priorities)) > (2/3));
if ($passing_slow) {
logger("Passing slower processes than priority ".$highest_priority, LOGGER_DEBUG);
Logger::log("Passing slower processes than priority ".$highest_priority, LOGGER_DEBUG);
}
return $passing_slow;
}
@ -816,7 +817,7 @@ class Worker
$slope = $queue_length / pow($lower_job_limit, $exponent);
$limit = min($queue_length, ceil($slope * pow($jobs, $exponent)));
logger('Deferred: ' . $deferred . ' - Total: ' . $jobs . ' - Maximum: ' . $queue_length . ' - jobs per queue: ' . $limit, LOGGER_DEBUG);
Logger::log('Deferred: ' . $deferred . ' - Total: ' . $jobs . ' - Maximum: ' . $queue_length . ' - jobs per queue: ' . $limit, LOGGER_DEBUG);
$ids = [];
if (self::passingSlow($highest_priority)) {
// Are there waiting processes with a higher priority than the currently highest?
@ -975,7 +976,7 @@ class Worker
self::runCron();
logger('Call worker', LOGGER_DEBUG);
Logger::log('Call worker', LOGGER_DEBUG);
self::spawnWorker();
return;
}
@ -1014,7 +1015,7 @@ class Worker
*/
private static function runCron()
{
logger('Add cron entries', LOGGER_DEBUG);
Logger::log('Add cron entries', LOGGER_DEBUG);
// Check for spooled items
self::add(PRIORITY_HIGH, "SpoolPost");
@ -1152,7 +1153,7 @@ class Worker
$id = $queue['id'];
if ($retrial > 14) {
logger('Id ' . $id . ' had been tried 14 times. We stop now.', LOGGER_DEBUG);
Logger::log('Id ' . $id . ' had been tried 14 times. We stop now.', LOGGER_DEBUG);
return;
}
@ -1160,7 +1161,7 @@ class Worker
$delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
Logger::log('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => DBA::NULL_DATETIME, 'pid' => 0];
DBA::update('workerqueue', $fields, ['id' => $id]);