Some loglevels are adjusted to more reasonablöe levels
This commit is contained in:
parent
90717b602e
commit
baf75adfca
10 changed files with 23 additions and 22 deletions
|
@ -166,7 +166,7 @@ class System
|
||||||
$load = System::currentLoad();
|
$load = System::currentLoad();
|
||||||
if ($load) {
|
if ($load) {
|
||||||
if (intval($load) > $maxsysload) {
|
if (intval($load) > $maxsysload) {
|
||||||
$this->logger->warning('system load for process too high.', ['load' => $load, 'process' => 'backend', 'maxsysload' => $maxsysload]);
|
$this->logger->notice('system load for process too high.', ['load' => $load, 'process' => 'backend', 'maxsysload' => $maxsysload]);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,7 +141,7 @@ class Worker
|
||||||
if (DI::lock()->acquire(self::LOCK_WORKER, 0)) {
|
if (DI::lock()->acquire(self::LOCK_WORKER, 0)) {
|
||||||
// Count active workers and compare them with a maximum value that depends on the load
|
// Count active workers and compare them with a maximum value that depends on the load
|
||||||
if (self::tooMuchWorkers()) {
|
if (self::tooMuchWorkers()) {
|
||||||
Logger::notice('Active worker limit reached, quitting.');
|
Logger::info('Active worker limit reached, quitting.');
|
||||||
DI::lock()->release(self::LOCK_WORKER);
|
DI::lock()->release(self::LOCK_WORKER);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -188,7 +188,7 @@ class Worker
|
||||||
{
|
{
|
||||||
// Count active workers and compare them with a maximum value that depends on the load
|
// Count active workers and compare them with a maximum value that depends on the load
|
||||||
if (self::tooMuchWorkers()) {
|
if (self::tooMuchWorkers()) {
|
||||||
Logger::notice('Active worker limit reached, quitting.');
|
Logger::info('Active worker limit reached, quitting.');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -511,7 +511,7 @@ class Worker
|
||||||
while ($load = System::getLoadAvg($processes_cooldown != 0)) {
|
while ($load = System::getLoadAvg($processes_cooldown != 0)) {
|
||||||
if (($load_cooldown > 0) && ($load['average1'] > $load_cooldown)) {
|
if (($load_cooldown > 0) && ($load['average1'] > $load_cooldown)) {
|
||||||
if (!$sleeping) {
|
if (!$sleeping) {
|
||||||
Logger::notice('Load induced pre execution cooldown.', ['max' => $load_cooldown, 'load' => $load, 'called-by' => System::callstack(1)]);
|
Logger::info('Load induced pre execution cooldown.', ['max' => $load_cooldown, 'load' => $load, 'called-by' => System::callstack(1)]);
|
||||||
$sleeping = true;
|
$sleeping = true;
|
||||||
}
|
}
|
||||||
sleep(1);
|
sleep(1);
|
||||||
|
@ -519,7 +519,7 @@ class Worker
|
||||||
}
|
}
|
||||||
if (($processes_cooldown > 0) && ($load['scheduled'] > $processes_cooldown)) {
|
if (($processes_cooldown > 0) && ($load['scheduled'] > $processes_cooldown)) {
|
||||||
if (!$sleeping) {
|
if (!$sleeping) {
|
||||||
Logger::notice('Process induced pre execution cooldown.', ['max' => $processes_cooldown, 'load' => $load, 'called-by' => System::callstack(1)]);
|
Logger::info('Process induced pre execution cooldown.', ['max' => $processes_cooldown, 'load' => $load, 'called-by' => System::callstack(1)]);
|
||||||
$sleeping = true;
|
$sleeping = true;
|
||||||
}
|
}
|
||||||
sleep(1);
|
sleep(1);
|
||||||
|
@ -529,7 +529,7 @@ class Worker
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($sleeping) {
|
if ($sleeping) {
|
||||||
Logger::notice('Cooldown ended.', ['max-load' => $load_cooldown, 'max-processes' => $processes_cooldown, 'load' => $load, 'called-by' => System::callstack(1)]);
|
Logger::info('Cooldown ended.', ['max-load' => $load_cooldown, 'max-processes' => $processes_cooldown, 'load' => $load, 'called-by' => System::callstack(1)]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -814,7 +814,7 @@ class Worker
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger::notice('Load: ' . $load . '/' . $maxsysload . ' - processes: ' . $deferred . '/' . $active . '/' . $waiting_processes . $processlist . ' - maximum: ' . $queues . '/' . $maxqueues);
|
Logger::info('Load: ' . $load . '/' . $maxsysload . ' - processes: ' . $deferred . '/' . $active . '/' . $waiting_processes . $processlist . ' - maximum: ' . $queues . '/' . $maxqueues);
|
||||||
|
|
||||||
// Are there fewer workers running as possible? Then fork a new one.
|
// Are there fewer workers running as possible? Then fork a new one.
|
||||||
if (!DI::config()->get('system', 'worker_dont_fork', false) && ($queues > ($active + 1)) && self::entriesExists() && !self::systemLimitReached()) {
|
if (!DI::config()->get('system', 'worker_dont_fork', false) && ($queues > ($active + 1)) && self::entriesExists() && !self::systemLimitReached()) {
|
||||||
|
|
|
@ -169,7 +169,7 @@ class APContact
|
||||||
$cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
|
$cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
|
||||||
$result = DI::cache()->get($cachekey);
|
$result = DI::cache()->get($cachekey);
|
||||||
if (!is_null($result)) {
|
if (!is_null($result)) {
|
||||||
Logger::notice('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]);
|
Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]);
|
||||||
if (!empty($fetched_contact)) {
|
if (!empty($fetched_contact)) {
|
||||||
return $fetched_contact;
|
return $fetched_contact;
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,7 @@ class Notify extends BaseModule
|
||||||
$msg = Diaspora::decodeRaw($postdata, '', true);
|
$msg = Diaspora::decodeRaw($postdata, '', true);
|
||||||
if (!is_array($msg)) {
|
if (!is_array($msg)) {
|
||||||
// We have to fail silently to be able to hand it over to the salmon parser
|
// We have to fail silently to be able to hand it over to the salmon parser
|
||||||
$this->logger->warning('Diaspora::decodeRaw() has failed for some reason.');
|
$this->logger->warning('Diaspora::decodeRaw() has failed for some reason.', ['post-data' => $postdata]);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,7 @@ class Notification extends BaseRepository
|
||||||
'parent-uri-id' => $itemUriId,
|
'parent-uri-id' => $itemUriId,
|
||||||
];
|
];
|
||||||
|
|
||||||
$this->logger->notice('deleteForItem', ['conditionTarget' => $conditionTarget, 'conditionParent' => $conditionParent]);
|
$this->logger->info('deleteForItem', ['conditionTarget' => $conditionTarget, 'conditionParent' => $conditionParent]);
|
||||||
|
|
||||||
return
|
return
|
||||||
$this->db->delete(self::$table_name, $conditionTarget)
|
$this->db->delete(self::$table_name, $conditionTarget)
|
||||||
|
|
|
@ -83,7 +83,7 @@ class HttpClient extends BaseFactory
|
||||||
ResponseInterface $response,
|
ResponseInterface $response,
|
||||||
UriInterface $uri
|
UriInterface $uri
|
||||||
) use ($logger) {
|
) use ($logger) {
|
||||||
$logger->notice('Curl redirect.', ['url' => $request->getUri(), 'to' => $uri, 'method' => $request->getMethod()]);
|
$logger->info('Curl redirect.', ['url' => $request->getUri(), 'to' => $uri, 'method' => $request->getMethod()]);
|
||||||
};
|
};
|
||||||
|
|
||||||
$userAgent = App::PLATFORM . " '" .
|
$userAgent = App::PLATFORM . " '" .
|
||||||
|
|
|
@ -505,7 +505,7 @@ class Processor
|
||||||
$recursion_depth = $activity['recursion-depth'] ?? 0;
|
$recursion_depth = $activity['recursion-depth'] ?? 0;
|
||||||
|
|
||||||
if (!$in_background && ($recursion_depth < DI::config()->get('system', 'max_recursion_depth'))) {
|
if (!$in_background && ($recursion_depth < DI::config()->get('system', 'max_recursion_depth'))) {
|
||||||
Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
|
Logger::info('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
|
||||||
$result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
|
$result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
|
||||||
if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
|
if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
|
||||||
Logger::notice('The activity is gone, the queue entry will be deleted', ['parent' => $activity['reply-to-id']]);
|
Logger::notice('The activity is gone, the queue entry will be deleted', ['parent' => $activity['reply-to-id']]);
|
||||||
|
@ -516,10 +516,10 @@ class Processor
|
||||||
} elseif (!empty($result)) {
|
} elseif (!empty($result)) {
|
||||||
$exists = Post::exists(['uri' => [$result, $activity['reply-to-id']]]);
|
$exists = Post::exists(['uri' => [$result, $activity['reply-to-id']]]);
|
||||||
if ($exists) {
|
if ($exists) {
|
||||||
Logger::notice('The activity has been fetched and created.', ['parent' => $result]);
|
Logger::info('The activity has been fetched and created.', ['parent' => $result]);
|
||||||
return $result;
|
return $result;
|
||||||
} elseif (DI::config()->get('system', 'fetch_by_worker') || DI::config()->get('system', 'decoupled_receiver')) {
|
} elseif (DI::config()->get('system', 'fetch_by_worker') || DI::config()->get('system', 'decoupled_receiver')) {
|
||||||
Logger::notice('The activity has been fetched and will hopefully be created later.', ['parent' => $result]);
|
Logger::info('The activity has been fetched and will hopefully be created later.', ['parent' => $result]);
|
||||||
} else {
|
} else {
|
||||||
Logger::notice('The activity exists but has not been created, the queue entry will be deleted.', ['parent' => $result]);
|
Logger::notice('The activity exists but has not been created, the queue entry will be deleted.', ['parent' => $result]);
|
||||||
if (!empty($activity['entry-id'])) {
|
if (!empty($activity['entry-id'])) {
|
||||||
|
@ -1561,11 +1561,11 @@ class Processor
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($completion == Receiver::COMPLETION_RELAY) && Queue::exists($url, 'as:Create')) {
|
if (($completion == Receiver::COMPLETION_RELAY) && Queue::exists($url, 'as:Create')) {
|
||||||
Logger::notice('Activity has already been queued.', ['url' => $url, 'object' => $activity['id']]);
|
Logger::info('Activity has already been queued.', ['url' => $url, 'object' => $activity['id']]);
|
||||||
} elseif (ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer, '', $completion)) {
|
} elseif (ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer, '', $completion)) {
|
||||||
Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'entry' => $child['entry-id'] ?? 0, 'completion' => $completion, 'object' => $activity['id']]);
|
Logger::info('Activity had been fetched and processed.', ['url' => $url, 'entry' => $child['entry-id'] ?? 0, 'completion' => $completion, 'object' => $activity['id']]);
|
||||||
} else {
|
} else {
|
||||||
Logger::notice('Activity had been fetched and will be processed later.', ['url' => $url, 'entry' => $child['entry-id'] ?? 0, 'completion' => $completion, 'object' => $activity['id']]);
|
Logger::info('Activity had been fetched and will be processed later.', ['url' => $url, 'entry' => $child['entry-id'] ?? 0, 'completion' => $completion, 'object' => $activity['id']]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $activity['id'];
|
return $activity['id'];
|
||||||
|
|
|
@ -792,7 +792,7 @@ class Diaspora
|
||||||
*/
|
*/
|
||||||
private static function key(WebFingerUri $uri): string
|
private static function key(WebFingerUri $uri): string
|
||||||
{
|
{
|
||||||
Logger::notice('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
|
Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
|
||||||
try {
|
try {
|
||||||
return DI::dsprContact()->getByAddr($uri)->pubKey;
|
return DI::dsprContact()->getByAddr($uri)->pubKey;
|
||||||
} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
|
} catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
|
||||||
|
|
|
@ -347,12 +347,13 @@ class HTTPSignature
|
||||||
if (!empty($gsid)) {
|
if (!empty($gsid)) {
|
||||||
$insertFields['gsid'] = $gsid;
|
$insertFields['gsid'] = $gsid;
|
||||||
}
|
}
|
||||||
if (!DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE)) {
|
DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE);
|
||||||
|
|
||||||
|
$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
|
||||||
|
if (empty($status)) {
|
||||||
Logger::warning('Unable to insert inbox-status row', $insertFields);
|
Logger::warning('Unable to insert inbox-status row', $insertFields);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($success) {
|
if ($success) {
|
||||||
|
|
|
@ -69,7 +69,7 @@ class LDSignature
|
||||||
$dhash = self::hash(self::signableData($data));
|
$dhash = self::hash(self::signableData($data));
|
||||||
|
|
||||||
$x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
|
$x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
|
||||||
Logger::notice('LD-verify', ['verified' => (int)$x, 'actor' => $profile['url']]);
|
Logger::info('LD-verify', ['verified' => (int)$x, 'actor' => $profile['url']]);
|
||||||
|
|
||||||
if (empty($x)) {
|
if (empty($x)) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue