clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Loglevels are adjusted

This commit is contained in:
Michael 2022-08-30 19:45:30 +00:00
parent 312e4d8844
commit 757a5c2de9
32 changed files with 93 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/display.php
View File

@ -102,7 +102,7 @@ function display_init(App $a)
} }
if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
Logger::info('Directly serving XML for uri-id '.$item['uri-id']); Logger::debug('Directly serving XML', ['uri-id' => $item['uri-id']]);
displayShowFeed($item['uri-id'], $item['uid'], false); displayShowFeed($item['uri-id'], $item['uid'], false);
} }

10
mod/item.php
View File

@ -89,7 +89,7 @@ function item_post(App $a) {
*/ */
if (!$preview && !empty($_REQUEST['post_id_random'])) { if (!$preview && !empty($_REQUEST['post_id_random'])) {
if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) { if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
Logger::info('item post: duplicate post'); Logger::warning('duplicate post');
item_post_return(DI::baseUrl(), $api_source, $return_path); item_post_return(DI::baseUrl(), $api_source, $return_path);
} else { } else {
$_SESSION['post-random'] = $_REQUEST['post_id_random']; $_SESSION['post-random'] = $_REQUEST['post_id_random'];
@ -177,7 +177,7 @@ function item_post(App $a) {
// Now check that valid personal details have been provided // Now check that valid personal details have been provided
if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
Logger::notice('Permission denied.', ['local' => local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]); Logger::warning('Permission denied.', ['local' => local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]);
notice(DI::l10n()->t('Permission denied.')); notice(DI::l10n()->t('Permission denied.'));
if ($return_path) { if ($return_path) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);
@ -755,7 +755,7 @@ function item_post(App $a) {
} }
} }
Logger::info('post_complete'); Logger::debug('post_complete');
if ($api_source) { if ($api_source) {
return $post_id; return $post_id;
@ -780,7 +780,7 @@ function item_post_return($baseurl, $api_source, $return_path)
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
} }
Logger::info('post_json', ['json' => $json]); Logger::debug('post_json', ['json' => $json]);
System::jsonExit($json); System::jsonExit($json);
} }
@ -866,7 +866,7 @@ function drop_item(int $id, string $return = '')
item_redirect_after_action($item, $return); item_redirect_after_action($item, $return);
} else { } else {
Logger::notice('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]); Logger::warning('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]);
notice(DI::l10n()->t('Permission denied.')); notice(DI::l10n()->t('Permission denied.'));
DI::baseUrl()->redirect('display/' . $item['guid']); DI::baseUrl()->redirect('display/' . $item['guid']);
//NOTREACHED //NOTREACHED

6
mod/photos.php
View File

@ -304,7 +304,7 @@ function photos_post(App $a)
} }
if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) { if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
Logger::notice('rotate'); Logger::debug('rotate');
$photo = Photo::getPhotoForUser($page_owner_uid, $resource_id); $photo = Photo::getPhotoForUser($page_owner_uid, $resource_id);
@ -580,7 +580,7 @@ function photos_post(App $a)
$album = trim($_REQUEST['album'] ?? ''); $album = trim($_REQUEST['album'] ?? '');
$newalbum = trim($_REQUEST['newalbum'] ?? ''); $newalbum = trim($_REQUEST['newalbum'] ?? '');
Logger::info('album= ' . $album . ' newalbum= ' . $newalbum); Logger::debug('album= ' . $album . ' newalbum= ' . $newalbum);
if (!strlen($album)) { if (!strlen($album)) {
if (strlen($newalbum)) { if (strlen($newalbum)) {
@ -711,7 +711,7 @@ function photos_post(App $a)
$r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if (!$r) { if (!$r) {
Logger::info('image store failed'); Logger::warning('image store failed');
notice(DI::l10n()->t('Image upload failed.')); notice(DI::l10n()->t('Image upload failed.'));
return; return;
} }

2
mod/settings.php
View File

@ -108,7 +108,7 @@ function settings_post(App $a)
'pubmail' => $mail_pubmail 'pubmail' => $mail_pubmail
], ['uid' => local_user()]); ], ['uid' => local_user()]);
Logger::notice('updating mailaccount', ['response' => $r]); Logger::debug('updating mailaccount', ['response' => $r]);
$mailacct = DBA::selectFirst('mailacct', [], ['uid' => local_user()]); $mailacct = DBA::selectFirst('mailacct', [], ['uid' => local_user()]);
if (DBA::isResult($mailacct)) { if (DBA::isResult($mailacct)) {
$mb = Email::constructMailboxName($mailacct); $mb = Email::constructMailboxName($mailacct);

4
mod/tagger.php
View File

@ -51,7 +51,7 @@ function tagger_content(App $a) {
$item_id = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1]) : 0); $item_id = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1]) : 0);
Logger::notice('tagger: tag ' . $term . ' item ' . $item_id); Logger::info('tagger: tag ' . $term . ' item ' . $item_id);
$item = Post::selectFirst([], ['id' => $item_id]); $item = Post::selectFirst([], ['id' => $item_id]);
@ -69,7 +69,7 @@ function tagger_content(App $a) {
$contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]); $contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
Logger::notice('tagger: no contact_id'); Logger::warning('Self contact not found.', ['uid' => local_user()]);
return; return;
} }

8
src/Contact/Avatar.php
View File

@ -165,11 +165,11 @@ class Avatar
Logger::warning('Directory could not be created', ['directory' => $dirpath]); Logger::warning('Directory could not be created', ['directory' => $dirpath]);
} }
} elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) { } elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) {
Logger::notice('Directory permissions could not be changed', ['directory' => $dirpath, 'old' => $old_perm, 'new' => $dir_perm]); Logger::warning('Directory permissions could not be changed', ['directory' => $dirpath, 'old' => $old_perm, 'new' => $dir_perm]);
} }
if ((($old_group = filegroup($dirpath)) != $group) && !chgrp($dirpath, $group)) { if ((($old_group = filegroup($dirpath)) != $group) && !chgrp($dirpath, $group)) {
Logger::notice('Directory group could not be changed', ['directory' => $dirpath, 'old' => $old_group, 'new' => $group]); Logger::warning('Directory group could not be changed', ['directory' => $dirpath, 'old' => $old_group, 'new' => $group]);
} }
} }
@ -181,11 +181,11 @@ class Avatar
$old_group = filegroup($filepath); $old_group = filegroup($filepath);
if (($old_perm != $file_perm) && !chmod($filepath, $file_perm)) { if (($old_perm != $file_perm) && !chmod($filepath, $file_perm)) {
Logger::notice('File permissions could not be changed', ['file' => $filepath, 'old' => $old_perm, 'new' => $file_perm]); Logger::warning('File permissions could not be changed', ['file' => $filepath, 'old' => $old_perm, 'new' => $file_perm]);
} }
if (($old_group != $group) && !chgrp($filepath, $group)) { if (($old_group != $group) && !chgrp($filepath, $group)) {
Logger::notice('File group could not be changed', ['file' => $filepath, 'old' => $old_group, 'new' => $group]); Logger::warning('File group could not be changed', ['file' => $filepath, 'old' => $old_group, 'new' => $group]);
} }
DI::profiler()->stopRecording(); DI::profiler()->stopRecording();

4
src/Content/PageInfo.php
View File

@ -42,7 +42,7 @@ class PageInfo
*/ */
public static function searchAndAppendToBody(string $body, bool $searchNakedUrls = false, bool $no_photos = false) public static function searchAndAppendToBody(string $body, bool $searchNakedUrls = false, bool $no_photos = false)
{ {
Logger::info('add_page_info_to_body: fetch page info for body', ['body' => $body]); Logger::debug('add_page_info_to_body: fetch page info for body', ['body' => $body]);
$url = self::getRelevantUrlFromBody($body, $searchNakedUrls); $url = self::getRelevantUrlFromBody($body, $searchNakedUrls);
if (!$url) { if (!$url) {
@ -208,7 +208,7 @@ class PageInfo
} }
} }
Logger::info('fetch page info for URL', ['url' => $url, 'data' => $data]); Logger::debug('fetch page info for URL', ['url' => $url, 'data' => $data]);
return $data; return $data;
} }

14
src/Content/Text/BBCode.php
View File

@ -498,7 +498,7 @@ class BBCode
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER); $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
if ($c) { if ($c) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
Logger::info('scale_external_image', ['image' => $mtch[1]]); Logger::debug('scale_external_image', ['image' => $mtch[1]]);
$hostname = str_replace('www.', '', substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3)); $hostname = str_replace('www.', '', substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3));
if (stristr($mtch[1], $hostname)) { if (stristr($mtch[1], $hostname)) {
@ -526,14 +526,14 @@ class BBCode
$Image->scaleDown(640); $Image->scaleDown(640);
$new_width = $Image->getWidth(); $new_width = $Image->getWidth();
$new_height = $Image->getHeight(); $new_height = $Image->getHeight();
Logger::info('External images scaled', ['orig_width' => $orig_width, 'new_width' => $new_width, 'orig_height' => $orig_height, 'new_height' => $new_height, 'match' => $mtch[0]]); Logger::debug('External images scaled', ['orig_width' => $orig_width, 'new_width' => $new_width, 'orig_height' => $orig_height, 'new_height' => $new_height, 'match' => $mtch[0]]);
$s = str_replace( $s = str_replace(
$mtch[0], $mtch[0],
'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]' '[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
. "\n", . "\n",
$s $s
); );
Logger::info('New string', ['image' => $s]); Logger::debug('New string', ['image' => $s]);
} }
} }
} }
@ -583,7 +583,7 @@ class BBCode
if (($textlen + $img_start) > $maxlen) { if (($textlen + $img_start) > $maxlen) {
if ($textlen < $maxlen) { if ($textlen < $maxlen) {
Logger::info('the limit happens before an embedded image'); Logger::debug('the limit happens before an embedded image');
$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
$textlen = $maxlen; $textlen = $maxlen;
} }
@ -597,7 +597,7 @@ class BBCode
if (($textlen + $img_end) > $maxlen) { if (($textlen + $img_end) > $maxlen) {
if ($textlen < $maxlen) { if ($textlen < $maxlen) {
Logger::info('the limit happens before the end of a non-embedded image'); Logger::debug('the limit happens before the end of a non-embedded image');
$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
$textlen = $maxlen; $textlen = $maxlen;
} }
@ -620,11 +620,11 @@ class BBCode
if (($textlen + strlen($orig_body)) > $maxlen) { if (($textlen + strlen($orig_body)) > $maxlen) {
if ($textlen < $maxlen) { if ($textlen < $maxlen) {
Logger::info('the limit happens after the end of the last image'); Logger::debug('the limit happens after the end of the last image');
$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
} }
} else { } else {
Logger::info('the text size with embedded images extracted did not violate the limit'); Logger::debug('the text size with embedded images extracted did not violate the limit');
$new_body = $new_body . $orig_body; $new_body = $new_body . $orig_body;
} }

6
src/Core/Addon.php
View File

@ -128,7 +128,7 @@ class Addon
{ {
$addon = Strings::sanitizeFilePathItem($addon); $addon = Strings::sanitizeFilePathItem($addon);
Logger::notice("Addon {addon}: {action}", ['action' => 'uninstall', 'addon' => $addon]); Logger::debug("Addon {addon}: {action}", ['action' => 'uninstall', 'addon' => $addon]);
DBA::delete('addon', ['name' => $addon]); DBA::delete('addon', ['name' => $addon]);
@include_once('addon/' . $addon . '/' . $addon . '.php'); @include_once('addon/' . $addon . '/' . $addon . '.php');
@ -160,7 +160,7 @@ class Addon
return false; return false;
} }
Logger::notice("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]); Logger::debug("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]);
$t = @filemtime($addon_file_path); $t = @filemtime($addon_file_path);
@include_once($addon_file_path); @include_once($addon_file_path);
if (function_exists($addon . '_install')) { if (function_exists($addon . '_install')) {
@ -200,7 +200,7 @@ class Addon
continue; continue;
} }
Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]); Logger::debug("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
self::uninstall($addon['name']); self::uninstall($addon['name']);
self::install($addon['name']); self::install($addon['name']);

22
src/Core/System.php
View File

@ -493,30 +493,30 @@ class System
* *
* @return boolean the directory is usable * @return boolean the directory is usable
*/ */
public static function isDirectoryUsable($directory, $check_writable = true) private static function isDirectoryUsable($directory, $check_writable = true)
{ {
if ($directory == '') { if ($directory == '') {
Logger::info('Directory is empty. This shouldn\'t happen.'); Logger::warning('Directory is empty. This shouldn\'t happen.');
return false; return false;
} }
if (!file_exists($directory)) { if (!file_exists($directory)) {
Logger::info('Path "' . $directory . '" does not exist for user ' . static::getUser()); Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
return false; return false;
} }
if (is_file($directory)) { if (is_file($directory)) {
Logger::info('Path "' . $directory . '" is a file for user ' . static::getUser()); Logger::warning('Path is a file', ['directory' => $directory, 'user' => static::getUser()]);
return false; return false;
} }
if (!is_dir($directory)) { if (!is_dir($directory)) {
Logger::info('Path "' . $directory . '" is not a directory for user ' . static::getUser()); Logger::warning('Path is not a directory', ['directory' => $directory, 'user' => static::getUser()]);
return false; return false;
} }
if ($check_writable && !is_writable($directory)) { if ($check_writable && !is_writable($directory)) {
Logger::info('Path "' . $directory . '" is not writable for user ' . static::getUser()); Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
return false; return false;
} }
@ -550,7 +550,7 @@ class System
{ {
$temppath = DI::config()->get("system", "temppath"); $temppath = DI::config()->get("system", "temppath");
if (($temppath != "") && System::isDirectoryUsable($temppath)) { if (($temppath != "") && self::isDirectoryUsable($temppath)) {
// We have a temp path and it is usable // We have a temp path and it is usable
return BasePath::getRealPath($temppath); return BasePath::getRealPath($temppath);
} }
@ -559,7 +559,7 @@ class System
$temppath = sys_get_temp_dir(); $temppath = sys_get_temp_dir();
// Check if it is usable // Check if it is usable
if (($temppath != "") && System::isDirectoryUsable($temppath)) { if (($temppath != "") && self::isDirectoryUsable($temppath)) {
// Always store the real path, not the path through symlinks // Always store the real path, not the path through symlinks
$temppath = BasePath::getRealPath($temppath); $temppath = BasePath::getRealPath($temppath);
@ -570,7 +570,7 @@ class System
mkdir($new_temppath); mkdir($new_temppath);
} }
if (System::isDirectoryUsable($new_temppath)) { if (self::isDirectoryUsable($new_temppath)) {
// The new path is usable, we are happy // The new path is usable, we are happy
DI::config()->set("system", "temppath", $new_temppath); DI::config()->set("system", "temppath", $new_temppath);
return $new_temppath; return $new_temppath;
@ -593,7 +593,7 @@ class System
public static function getSpoolPath() public static function getSpoolPath()
{ {
$spoolpath = DI::config()->get('system', 'spoolpath'); $spoolpath = DI::config()->get('system', 'spoolpath');
if (($spoolpath != "") && System::isDirectoryUsable($spoolpath)) { if (($spoolpath != "") && self::isDirectoryUsable($spoolpath)) {
// We have a spool path and it is usable // We have a spool path and it is usable
return $spoolpath; return $spoolpath;
} }
@ -608,7 +608,7 @@ class System
mkdir($spoolpath); mkdir($spoolpath);
} }
if (System::isDirectoryUsable($spoolpath)) { if (self::isDirectoryUsable($spoolpath)) {
// The new path is usable, we are happy // The new path is usable, we are happy
DI::config()->set("system", "spoolpath", $spoolpath); DI::config()->set("system", "spoolpath", $spoolpath);
return $spoolpath; return $spoolpath;

2
src/Core/Worker.php
View File

@ -104,7 +104,7 @@ class Worker
foreach ($r as $entry) { foreach ($r as $entry) {
// The work will be done // The work will be done
if (!self::execute($entry)) { if (!self::execute($entry)) {
Logger::notice('Process execution failed, quitting.'); Logger::warning('Process execution failed, quitting.');
return; return;
} }

2
src/Core/Worker/Cron.php
View File

@ -101,7 +101,7 @@ class Cron
// How long is the process already running? // How long is the process already running?
$duration = (time() - strtotime($entry["executed"])) / 60; $duration = (time() - strtotime($entry["executed"])) / 60;
if ($duration > $max_duration) { if ($duration > $max_duration) {
Logger::notice('Worker process took too much time - killed', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]); Logger::warning('Worker process took too much time - killed', ['duration' => number_format($duration, 3), 'max' => $max_duration, 'id' => $entry["id"], 'pid' => $entry["pid"], 'command' => $command]);
posix_kill($entry["pid"], SIGTERM); posix_kill($entry["pid"], SIGTERM);
// We killed the stale process. // We killed the stale process.

2
src/Database/DBStructure.php
View File

@ -119,7 +119,7 @@ class DBStructure
$tables = array_merge($tables, DBA::selectToArray( $tables = array_merge($tables, DBA::selectToArray(
'information_schema.tables', 'information_schema.tables',
['table_name'], ['table_name'],
['engine' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT'], 'table_schema' => DBA::databaseName()] ['engine' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT', 'COMPRESSED'], 'table_schema' => DBA::databaseName()]
)); ));
if (!DBA::isResult($tables)) { if (!DBA::isResult($tables)) {

2
src/Model/Contact.php
View File

@ -1299,7 +1299,7 @@ class Contact
} }
if (!$contact_id) { if (!$contact_id) {
Logger::info('Contact was not inserted', ['url' => $url, 'uid' => $uid]); Logger::warning('Contact was not inserted', ['url' => $url, 'uid' => $uid]);
return 0; return 0;
} }
} else { } else {

2
src/Model/Contact/Relation.php
View File

@ -108,7 +108,7 @@ class Relation
$followings = []; $followings = [];
} }
} else { } else {
Logger::notice('Contact seems to be local but could not be found here', ['url' => $url]); Logger::warning('Contact seems to be local but could not be found here', ['url' => $url]);
$followers = []; $followers = [];
$followings = []; $followings = [];
} }

8
src/Model/Item.php
View File

@ -279,7 +279,7 @@ class Item
if ($item['uid'] == $uid) { if ($item['uid'] == $uid) {
self::markForDeletionById($item['id'], PRIORITY_HIGH); self::markForDeletionById($item['id'], PRIORITY_HIGH);
} elseif ($item['uid'] != 0) { } elseif ($item['uid'] != 0) {
Logger::notice('Wrong ownership. Not deleting item', ['id' => $item['id']]); Logger::warning('Wrong ownership. Not deleting item', ['id' => $item['id']]);
} }
} }
DBA::close($items); DBA::close($items);
@ -580,7 +580,7 @@ class Item
if (!empty($item['uid'])) { if (!empty($item['uid'])) {
$owner = User::getOwnerDataById($item['uid'], false); $owner = User::getOwnerDataById($item['uid'], false);
if (!$owner) { if (!$owner) {
Logger::notice('Missing item user owner data', ['uid' => $item['uid']]); Logger::warning('Missing item user owner data', ['uid' => $item['uid']]);
return false; return false;
} }
@ -2515,7 +2515,7 @@ class Item
$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]); $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
Logger::notice('like: unknown item', ['id' => $item_id]); Logger::warning('Post had not been fetched', ['id' => $item_id]);
return false; return false;
} }
@ -2581,7 +2581,7 @@ class Item
$activity = Activity::ANNOUNCE; $activity = Activity::ANNOUNCE;
break; break;
default: default:
Logger::notice('unknown verb', ['verb' => $verb, 'item' => $item_id]); Logger::warning('unknown verb', ['verb' => $verb, 'item' => $item_id]);
return false; return false;
} }

4
src/Model/Mail.php
View File

@ -186,7 +186,7 @@ class Mail
} }
if (!$convid) { if (!$convid) {
Logger::notice('send message: conversation not found.'); Logger::warning('conversation not found.');
return -4; return -4;
} }
@ -290,7 +290,7 @@ class Mail
} }
if (!$convid) { if (!$convid) {
Logger::notice('send message: conversation not found.'); Logger::warning('conversation not found.');
return -4; return -4;
} }

10
src/Model/Photo.php
View File

@ -1095,7 +1095,7 @@ class Photo
$r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::notice('Photo could not be stored'); Logger::warning('Photo could not be stored');
return []; return [];
} }
@ -1182,7 +1182,7 @@ class Photo
$r = self::store($image, $uid, 0, $resource_id, $filename, $album, 4, self::USER_AVATAR); $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 4, self::USER_AVATAR);
if (!$r) { if (!$r) {
logger::notice('profile image upload with scale 4 (300) failed'); logger::warning('profile image upload with scale 4 (300) failed');
} }
if ($width > 80 || $height > 80) { if ($width > 80 || $height > 80) {
@ -1191,7 +1191,7 @@ class Photo
$r = self::store($image, $uid, 0, $resource_id, $filename, $album, 5, self::USER_AVATAR); $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 5, self::USER_AVATAR);
if (!$r) { if (!$r) {
logger::notice('profile image upload with scale 5 (80) failed'); logger::warning('profile image upload with scale 5 (80) failed');
} }
if ($width > 48 || $height > 48) { if ($width > 48 || $height > 48) {
@ -1200,7 +1200,7 @@ class Photo
$r = self::store($image, $uid, 0, $resource_id, $filename, $album, 6, self::USER_AVATAR); $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 6, self::USER_AVATAR);
if (!$r) { if (!$r) {
logger::notice('profile image upload with scale 6 (48) failed'); logger::warning('profile image upload with scale 6 (48) failed');
} }
logger::info('new profile image upload ended'); logger::info('new profile image upload ended');
@ -1257,7 +1257,7 @@ class Photo
$r = self::store($image, $uid, 0, $resource_id, $filename, $album, 3, self::USER_BANNER); $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 3, self::USER_BANNER);
if (!$r) { if (!$r) {
logger::notice('profile banner upload with scale 3 (960) failed'); logger::warning('profile banner upload with scale 3 (960) failed');
} }
logger::info('new profile banner upload ended'); logger::info('new profile banner upload ended');

12
src/Model/Post.php
View File

@ -533,7 +533,7 @@ class Post
$puids = array_column($rows, 'post-user-id'); $puids = array_column($rows, 'post-user-id');
if (!DBA::update('post-user', $update_fields, ['id' => $puids])) { if (!DBA::update('post-user', $update_fields, ['id' => $puids])) {
DBA::rollback(); DBA::rollback();
Logger::notice('Updating post-user failed', ['fields' => $update_fields, 'condition' => $condition]); Logger::warning('Updating post-user failed', ['fields' => $update_fields, 'condition' => $condition]);
return false; return false;
} }
$affected_count += DBA::affectedRows(); $affected_count += DBA::affectedRows();
@ -550,7 +550,7 @@ class Post
$uriids = array_column($rows, 'uri-id'); $uriids = array_column($rows, 'uri-id');
if (!DBA::update('post-content', $update_fields, ['uri-id' => $uriids])) { if (!DBA::update('post-content', $update_fields, ['uri-id' => $uriids])) {
DBA::rollback(); DBA::rollback();
Logger::notice('Updating post-content failed', ['fields' => $update_fields, 'condition' => $condition]); Logger::warning('Updating post-content failed', ['fields' => $update_fields, 'condition' => $condition]);
return false; return false;
} }
$affected_count += DBA::affectedRows(); $affected_count += DBA::affectedRows();
@ -573,7 +573,7 @@ class Post
if (!DBA::update('post', $update_fields, ['uri-id' => $uriids])) { if (!DBA::update('post', $update_fields, ['uri-id' => $uriids])) {
DBA::rollback(); DBA::rollback();
Logger::notice('Updating post failed', ['fields' => $update_fields, 'condition' => $condition]); Logger::warning('Updating post failed', ['fields' => $update_fields, 'condition' => $condition]);
return false; return false;
} }
$affected_count += DBA::affectedRows(); $affected_count += DBA::affectedRows();
@ -590,7 +590,7 @@ class Post
$uriids = array_column($rows, 'uri-id'); $uriids = array_column($rows, 'uri-id');
if (!DBA::update('post-delivery-data', $update_fields, ['uri-id' => $uriids])) { if (!DBA::update('post-delivery-data', $update_fields, ['uri-id' => $uriids])) {
DBA::rollback(); DBA::rollback();
Logger::notice('Updating post-delivery-data failed', ['fields' => $update_fields, 'condition' => $condition]); Logger::warning('Updating post-delivery-data failed', ['fields' => $update_fields, 'condition' => $condition]);
return false; return false;
} }
$affected_count += DBA::affectedRows(); $affected_count += DBA::affectedRows();
@ -607,7 +607,7 @@ class Post
$uriids = array_column($rows, 'uri-id'); $uriids = array_column($rows, 'uri-id');
if (!DBA::update('post-thread', $update_fields, ['uri-id' => $uriids])) { if (!DBA::update('post-thread', $update_fields, ['uri-id' => $uriids])) {
DBA::rollback(); DBA::rollback();
Logger::notice('Updating post-thread failed', ['fields' => $update_fields, 'condition' => $condition]); Logger::warning('Updating post-thread failed', ['fields' => $update_fields, 'condition' => $condition]);
return false; return false;
} }
$affected_count += DBA::affectedRows(); $affected_count += DBA::affectedRows();
@ -624,7 +624,7 @@ class Post
$thread_puids = array_column($rows, 'post-user-id'); $thread_puids = array_column($rows, 'post-user-id');
if (!DBA::update('post-thread-user', $update_fields, ['post-user-id' => $thread_puids])) { if (!DBA::update('post-thread-user', $update_fields, ['post-user-id' => $thread_puids])) {
DBA::rollback(); DBA::rollback();
Logger::notice('Updating post-thread-user failed', ['fields' => $update_fields, 'condition' => $condition]); Logger::warning('Updating post-thread-user failed', ['fields' => $update_fields, 'condition' => $condition]);
return false; return false;
} }
$affected_count += DBA::affectedRows(); $affected_count += DBA::affectedRows();

2
src/Protocol/ActivityPub/Delivery.php
View File

@ -82,7 +82,7 @@ class Delivery
if (empty($item_id) && !empty($uri_id) && !empty($uid)) { if (empty($item_id) && !empty($uri_id) && !empty($uid)) {
$item = Post::selectFirst(['id', 'parent', 'origin'], ['uri-id' => $uri_id, 'uid' => [$uid, 0]], ['order' => ['uid' => true]]); $item = Post::selectFirst(['id', 'parent', 'origin'], ['uri-id' => $uri_id, 'uid' => [$uid, 0]], ['order' => ['uid' => true]]);
if (empty($item['id'])) { if (empty($item['id'])) {
Logger::notice('Item not found, removing delivery', ['uri-id' => $uri_id, 'uid' => $uid, 'cmd' => $cmd, 'inbox' => $inbox]); Logger::warning('Item not found, removing delivery', ['uri-id' => $uri_id, 'uid' => $uid, 'cmd' => $cmd, 'inbox' => $inbox]);
Post\Delivery::remove($uri_id, $inbox); Post\Delivery::remove($uri_id, $inbox);
return true; return true;
} else { } else {

25
src/Protocol/DFRN.php
View File

@ -747,7 +747,7 @@ class DFRN
$mentioned = []; $mentioned = [];
if (!$item['parent']) { if (!$item['parent']) {
Logger::notice('Item without parent found.', ['type' => $type, 'item' => $item]); Logger::warning('Item without parent found.', ['type' => $type, 'item' => $item]);
return null; return null;
} }
@ -1466,9 +1466,8 @@ class DFRN
// update contact // update contact
$old = Contact::selectFirst(['photo', 'url'], ['id' => $importer['id'], 'uid' => $importer['importer_uid']]); $old = Contact::selectFirst(['photo', 'url'], ['id' => $importer['id'], 'uid' => $importer['importer_uid']]);
if (!DBA::isResult($old)) { if (!DBA::isResult($old)) {
Logger::notice("Query failed to execute, no result returned in " . __FUNCTION__); Logger::warning('Existing contact had not been fetched', ['id' => $importer['id']]);
return false; return false;
} }
@ -1550,24 +1549,9 @@ class DFRN
private static function getEntryType(array $importer, array $item): int private static function getEntryType(array $importer, array $item): int
{ {
if ($item['thr-parent'] != $item['uri']) { if ($item['thr-parent'] != $item['uri']) {
$community = false;
if ($importer['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
$sql_extra = '';
$community = true;
Logger::notice("possible community action");
} else {
$sql_extra = " AND `self` AND `wall`";
}
// was the top-level post for this action written by somebody on this site? // was the top-level post for this action written by somebody on this site?
// Specifically, the recipient? // Specifically, the recipient?
$parent = Post::selectFirst(['wall'], if (Post::exists(['uri' => $item['thr-parent'], 'uid' => $importer['importer_uid'], 'self' => true, 'wall' => true])) {
["`uri` = ? AND `uid` = ?" . $sql_extra, $item['thr-parent'], $importer['importer_uid']]);
$is_a_remote_action = DBA::isResult($parent);
if ($is_a_remote_action) {
return DFRN::REPLY_RC; return DFRN::REPLY_RC;
} else { } else {
return DFRN::REPLY; return DFRN::REPLY;
@ -1665,9 +1649,8 @@ class DFRN
if ($xt->type == Activity\ObjectType::NOTE) { if ($xt->type == Activity\ObjectType::NOTE) {
$item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer['importer_uid']]); $item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer['importer_uid']]);
if (!DBA::isResult($item_tag)) { if (!DBA::isResult($item_tag)) {
Logger::notice("Query failed to execute, no result returned in " . __FUNCTION__); Logger::warning('Post had not been fetched', ['uri' => $xt->id, 'uid' => $importer['importer_uid']]);
return false; return false;
} }

8
src/Protocol/Diaspora.php
View File

@ -475,7 +475,7 @@ class Diaspora
} }
if (!($fields = self::validPosting($msg))) { if (!($fields = self::validPosting($msg))) {
Logger::notice('Invalid posting'); Logger::warning('Invalid posting');
return false; return false;
} }
@ -510,7 +510,7 @@ class Diaspora
if (is_null($fields)) { if (is_null($fields)) {
$private = true; $private = true;
if (!($fields = self::validPosting($msg))) { if (!($fields = self::validPosting($msg))) {
Logger::notice('Invalid posting'); Logger::warning('Invalid posting');
return false; return false;
} }
} else { } else {
@ -1711,7 +1711,7 @@ class Diaspora
} }
} }
if (!$conversation) { if (!$conversation) {
Logger::notice('Unable to create conversation.'); Logger::warning('Unable to create conversation.');
return false; return false;
} }
@ -3644,7 +3644,7 @@ class Diaspora
$attend_answer = 'tentative'; $attend_answer = 'tentative';
break; break;
default: default:
Logger::notice('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']); Logger::warning('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']);
return false; return false;
} }

10
src/Protocol/Email.php
View File

@ -51,12 +51,12 @@ class Email
$errors = imap_errors(); $errors = imap_errors();
if (!empty($errors)) { if (!empty($errors)) {
Logger::notice('IMAP Errors occured', ['errors' => $errors]); Logger::warning('IMAP Errors occured', ['errors' => $errors]);
} }
$alerts = imap_alerts(); $alerts = imap_alerts();
if (!empty($alerts)) { if (!empty($alerts)) {
Logger::notice('IMAP Alerts occured: ', ['alerts' => $alerts]); Logger::warning('IMAP Alerts occured: ', ['alerts' => $alerts]);
} }
return $mbox; return $mbox;
@ -78,21 +78,21 @@ class Email
if (!$search1) { if (!$search1) {
$search1 = []; $search1 = [];
} else { } else {
Logger::notice("Found mails from ".$email_addr); Logger::debug("Found mails from ".$email_addr);
} }
$search2 = @imap_search($mbox, 'UNDELETED TO "' . $email_addr . '"', SE_UID); $search2 = @imap_search($mbox, 'UNDELETED TO "' . $email_addr . '"', SE_UID);
if (!$search2) { if (!$search2) {
$search2 = []; $search2 = [];
} else { } else {
Logger::notice("Found mails to ".$email_addr); Logger::debug("Found mails to ".$email_addr);
} }
$search3 = @imap_search($mbox, 'UNDELETED CC "' . $email_addr . '"', SE_UID); $search3 = @imap_search($mbox, 'UNDELETED CC "' . $email_addr . '"', SE_UID);
if (!$search3) { if (!$search3) {
$search3 = []; $search3 = [];
} else { } else {
Logger::notice("Found mails cc ".$email_addr); Logger::debug("Found mails cc ".$email_addr);
} }
$res = array_unique(array_merge($search1, $search2, $search3)); $res = array_unique(array_merge($search1, $search2, $search3));

2
src/Util/DateTimeFormat.php
View File

@ -158,7 +158,7 @@ class DateTimeFormat
try { try {
$d = new DateTime($s, $from_obj); $d = new DateTime($s, $from_obj);
} catch (Exception $e) { } catch (Exception $e) {
Logger::notice('DateTimeFormat::convert: exception: ' . $e->getMessage()); Logger::warning('DateTimeFormat::convert: exception: ' . $e->getMessage());
$d = new DateTime('now', $from_obj); $d = new DateTime('now', $from_obj);
} }

2
src/Util/ParseUrl.php
View File

@ -214,7 +214,7 @@ class ParseUrl
]; ];
if ($count > 10) { if ($count > 10) {
Logger::notice('Endless loop detected', ['url' => $url]); Logger::warning('Endless loop detected', ['url' => $url]);
return $siteinfo; return $siteinfo;
} }

6
src/Util/XML.php
View File

@ -270,7 +270,7 @@ class XML
} }
if (!function_exists('xml_parser_create')) { if (!function_exists('xml_parser_create')) {
Logger::notice('Xml::toArray: parser function missing'); Logger::error('Xml::toArray: parser function missing');
return []; return [];
} }
@ -285,8 +285,8 @@ class XML
$parser = @xml_parser_create(); $parser = @xml_parser_create();
} }
if (! $parser) { if (!$parser) {
Logger::notice('Xml::toArray: xml_parser_create: no resource'); Logger::warning('Xml::toArray: xml_parser_create: no resource');
return []; return [];
} }

8
src/Worker/Delivery.php
View File

@ -103,12 +103,12 @@ class Delivery
DBA::close($itemdata); DBA::close($itemdata);
if (empty($target_item)) { if (empty($target_item)) {
Logger::notice('Item ' . $target_id . "wasn't found. Quitting here."); Logger::warning('Item ' . $target_id . "wasn't found. Quitting here.");
return; return;
} }
if (empty($parent)) { if (empty($parent)) {
Logger::notice('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here."); Logger::warning('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
self::setFailedQueue($cmd, $target_item); self::setFailedQueue($cmd, $target_item);
return; return;
} }
@ -182,7 +182,7 @@ class Delivery
} }
if (empty($items)) { if (empty($items)) {
Logger::notice('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]); Logger::warning('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]);
} }
$owner = Model\User::getOwnerDataById($uid); $owner = Model\User::getOwnerDataById($uid);
@ -432,7 +432,7 @@ class Delivery
Logger::notice('diaspora status: ' . $loc); Logger::notice('diaspora status: ' . $loc);
$deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message); $deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
} else { } else {
Logger::notice('Unknown mode ' . $cmd . ' for ' . $loc); Logger::warning('Unknown mode', ['command' => $cmd, 'target' => $loc]);
return; return;
} }

2
src/Worker/OnePoll.php
View File

@ -394,7 +394,7 @@ class OnePoll
$datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray); $datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
if (empty($datarray['body'])) { if (empty($datarray['body'])) {
Logger::notice("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']); Logger::warning('Cannot fetch mail', ['msg-id' => $msg_uid, 'uid' => $mailconf['user']]);
continue; continue;
} }

2
src/Worker/RemoveUnusedAvatars.php
View File

@ -56,7 +56,7 @@ class RemoveUnusedAvatars
Logger::notice('We are outside of the maintenance window, quitting'); Logger::notice('We are outside of the maintenance window, quitting');
return; return;
} }
Logger::notice('In removal', ['count' => $count, 'total' => $total]); Logger::info('In removal', ['count' => $count, 'total' => $total]);
} }
} }
DBA::close($contacts); DBA::close($contacts);

2
src/Worker/RemoveUnusedContacts.php
View File

@ -80,7 +80,7 @@ class RemoveUnusedContacts
DBA::delete('contact', ['id' => $contact['id']]); DBA::delete('contact', ['id' => $contact['id']]);
if ((++$count % 1000) == 0) { if ((++$count % 1000) == 0) {
Logger::notice('In removal', ['count' => $count, 'total' => $total]); Logger::info('In removal', ['count' => $count, 'total' => $total]);
} }
} }
DBA::close($contacts); DBA::close($contacts);

10
src/Worker/SpoolPost.php
View File

@ -38,7 +38,7 @@ class SpoolPost {
// It is not named like a spool file, so we don't care. // It is not named like a spool file, so we don't care.
if (substr($file, 0, 5) != "item-") { if (substr($file, 0, 5) != "item-") {
Logger::notice('Spool file does does not start with "item-"', ['file' => $file]); Logger::info('Spool file does does not start with "item-"', ['file' => $file]);
continue; continue;
} }
@ -46,13 +46,13 @@ class SpoolPost {
// We don't care about directories either // We don't care about directories either
if (filetype($fullfile) != "file") { if (filetype($fullfile) != "file") {
Logger::notice('Spool file is no file', ['file' => $file]); Logger::info('Spool file is no file', ['file' => $file]);
continue; continue;
} }
// We can't read or write the file? So we don't care about it. // We can't read or write the file? So we don't care about it.
if (!is_writable($fullfile) || !is_readable($fullfile)) { if (!is_writable($fullfile) || !is_readable($fullfile)) {
Logger::notice('Spool file has insufficent permissions', ['file' => $file, 'writable' => is_writable($fullfile), 'readable' => is_readable($fullfile)]); Logger::warning('Spool file has insufficent permissions', ['file' => $file, 'writable' => is_writable($fullfile), 'readable' => is_readable($fullfile)]);
continue; continue;
} }
@ -66,13 +66,13 @@ class SpoolPost {
// Skip if it doesn't seem to be an item array // Skip if it doesn't seem to be an item array
if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) { if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) {
Logger::notice('Spool file does not contain the needed fields', ['file' => $file]); Logger::warning('Spool file does not contain the needed fields', ['file' => $file]);
continue; continue;
} }
$result = Item::insert($arr); $result = Item::insert($arr);
Logger::notice('Spool file is stored', ['file' => $file, 'result' => $result]); Logger::info('Spool file is stored', ['file' => $file, 'result' => $result]);
unlink($fullfile); unlink($fullfile);
} }
closedir($dh); closedir($dh);

3
view/theme/vier/style.php
View File

@ -49,8 +49,7 @@ foreach (['style', $style] as $file) {
$modified = $stylemodified; $modified = $stylemodified;
} }
} else { } else {
//TODO: use Logger::ERROR? Logger::warning('Missing CSS file', ['file' => $stylecssfile, 'uid' => $uid]);
Logger::notice('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
} }
} }
$modified = gmdate('r', $modified); $modified = gmdate('r', $modified);