]> git.mxchange.org Git - friendica.git/commitdiff
Loglevels are adjusted
authorMichael <heluecht@pirati.ca>
Tue, 30 Aug 2022 19:45:30 +0000 (19:45 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 30 Aug 2022 19:45:30 +0000 (19:45 +0000)
32 files changed:
mod/display.php
mod/item.php
mod/photos.php
mod/settings.php
mod/tagger.php
src/Contact/Avatar.php
src/Content/PageInfo.php
src/Content/Text/BBCode.php
src/Core/Addon.php
src/Core/System.php
src/Core/Worker.php
src/Core/Worker/Cron.php
src/Database/DBStructure.php
src/Model/Contact.php
src/Model/Contact/Relation.php
src/Model/Item.php
src/Model/Mail.php
src/Model/Photo.php
src/Model/Post.php
src/Protocol/ActivityPub/Delivery.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Protocol/Email.php
src/Util/DateTimeFormat.php
src/Util/ParseUrl.php
src/Util/XML.php
src/Worker/Delivery.php
src/Worker/OnePoll.php
src/Worker/RemoveUnusedAvatars.php
src/Worker/RemoveUnusedContacts.php
src/Worker/SpoolPost.php
view/theme/vier/style.php

index ed2c9ef0f7886e4c19e77422159a16a3a668e422..5aba7eb81d273c613a91c12f41dd59c887d6bc30 100644 (file)
@@ -102,7 +102,7 @@ function display_init(App $a)
        }
 
        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);
        }
 
index 26dcef91cdf21db43ccb612974b0c6d0ff27b432..6793d44342dea2ccca82988fc3d2e2ab248a94c3 100644 (file)
@@ -89,7 +89,7 @@ function item_post(App $a) {
         */
        if (!$preview && !empty($_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);
                } else {
                        $_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
        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.'));
                if ($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) {
                return $post_id;
@@ -780,7 +780,7 @@ function item_post_return($baseurl, $api_source, $return_path)
                $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
        }
 
-       Logger::info('post_json', ['json' => $json]);
+       Logger::debug('post_json', ['json' => $json]);
 
        System::jsonExit($json);
 }
@@ -866,7 +866,7 @@ function drop_item(int $id, string $return = '')
 
                item_redirect_after_action($item, $return);
        } 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.'));
                DI::baseUrl()->redirect('display/' . $item['guid']);
                //NOTREACHED
index ed73f05ded8953144cedb5e59ca6d80ccb121fa3..8244ac2b81ea67c37e7c420de68da2a47f3c4c9b 100644 (file)
@@ -304,7 +304,7 @@ function photos_post(App $a)
                }
 
                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);
 
@@ -580,7 +580,7 @@ function photos_post(App $a)
        $album    = trim($_REQUEST['album'] ?? '');
        $newalbum = trim($_REQUEST['newalbum'] ?? '');
 
-       Logger::info('album= ' . $album . ' newalbum= ' . $newalbum);
+       Logger::debug('album= ' . $album . ' newalbum= ' . $newalbum);
 
        if (!strlen($album)) {
                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);
 
        if (!$r) {
-               Logger::info('image store failed');
+               Logger::warning('image store failed');
                notice(DI::l10n()->t('Image upload failed.'));
                return;
        }
index 612907ac2eaa92d19accf4086832a6b93b079fcb..2e21c26824cda40987c484c45a278426fb5e150f 100644 (file)
@@ -108,7 +108,7 @@ function settings_post(App $a)
                                        'pubmail'      => $mail_pubmail
                                ], ['uid' => local_user()]);
 
-                               Logger::notice('updating mailaccount', ['response' => $r]);
+                               Logger::debug('updating mailaccount', ['response' => $r]);
                                $mailacct = DBA::selectFirst('mailacct', [], ['uid' => local_user()]);
                                if (DBA::isResult($mailacct)) {
                                        $mb = Email::constructMailboxName($mailacct);
index e674efba698a567a66398eb8dc8c2ccccd6aaee4..f4f77c08ef541946b0d7dfea040d7416333a177f 100644 (file)
@@ -51,7 +51,7 @@ function tagger_content(App $a) {
 
        $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]);
@@ -69,7 +69,7 @@ function tagger_content(App $a) {
 
        $contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]);
        if (!DBA::isResult($contact)) {
-               Logger::notice('tagger: no contact_id');
+               Logger::warning('Self contact not found.', ['uid' => local_user()]);
                return;
        }
 
index d03a5f4e64d9337b5eb6bb77ec1e881f21f7a32a..d4368df22baac8771656342f495c83e7cddc5add 100644 (file)
@@ -165,11 +165,11 @@ class Avatar
                                        Logger::warning('Directory could not be created', ['directory' => $dirpath]);
                                }
                        } 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)) {
-                               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);
 
                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)) {
-                       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();
index 71ffebc44453a72bfdb2e23ffbd9a0731056533e..fa6a93994de978d55dd4e195271edba3610fb1f2 100644 (file)
@@ -42,7 +42,7 @@ class PageInfo
         */
        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);
                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;
        }
index 7bb65b698f885d637ee0fa0cfba9bd4c45ec0e31..a46b55f3883650de840a7ce07e1dae93ff572474 100644 (file)
@@ -498,7 +498,7 @@ class BBCode
                $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
                if ($c) {
                        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));
                                if (stristr($mtch[1], $hostname)) {
@@ -526,14 +526,14 @@ class BBCode
                                                        $Image->scaleDown(640);
                                                        $new_width = $Image->getWidth();
                                                        $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(
                                                                $mtch[0],
                                                                '[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
                                                                . "\n",
                                                                $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 < $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);
                                                        $textlen = $maxlen;
                                                }
@@ -597,7 +597,7 @@ class BBCode
 
                                        if (($textlen + $img_end) > $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);
                                                        $textlen = $maxlen;
                                                }
@@ -620,11 +620,11 @@ class BBCode
 
                        if (($textlen + strlen($orig_body)) > $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);
                                }
                        } 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;
                        }
 
index 37ef335a47d9a97c3a5967bfd60111e7bcfd18ed..ea5c3abf0bfe81571f988078f2305dc6d284af4d 100644 (file)
@@ -128,7 +128,7 @@ class 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]);
 
                @include_once('addon/' . $addon . '/' . $addon . '.php');
@@ -160,7 +160,7 @@ class Addon
                        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);
                @include_once($addon_file_path);
                if (function_exists($addon . '_install')) {
@@ -200,7 +200,7 @@ class Addon
                                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::install($addon['name']);
index 8712b6ca5965f1a5820bd6544957ef6508df7a7e..dbff4bf3f5cb5f5d21c2bd537a230b315c30bbfe 100644 (file)
@@ -493,30 +493,30 @@ class System
         *
         * @return boolean the directory is usable
         */
-       public static function isDirectoryUsable($directory, $check_writable = true)
+       private static function isDirectoryUsable($directory, $check_writable = true)
        {
                if ($directory == '') {
-                       Logger::info('Directory is empty. This shouldn\'t happen.');
+                       Logger::warning('Directory is empty. This shouldn\'t happen.');
                        return false;
                }
 
                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;
                }
 
                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;
                }
 
                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;
                }
 
                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;
                }
 
@@ -550,7 +550,7 @@ class System
        {
                $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
                        return BasePath::getRealPath($temppath);
                }
@@ -559,7 +559,7 @@ class System
                $temppath = sys_get_temp_dir();
 
                // 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
                        $temppath = BasePath::getRealPath($temppath);
 
@@ -570,7 +570,7 @@ class System
                                mkdir($new_temppath);
                        }
 
-                       if (System::isDirectoryUsable($new_temppath)) {
+                       if (self::isDirectoryUsable($new_temppath)) {
                                // The new path is usable, we are happy
                                DI::config()->set("system", "temppath", $new_temppath);
                                return $new_temppath;
@@ -593,7 +593,7 @@ class System
        public static function getSpoolPath()
        {
                $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
                        return $spoolpath;
                }
@@ -608,7 +608,7 @@ class System
                                mkdir($spoolpath);
                        }
 
-                       if (System::isDirectoryUsable($spoolpath)) {
+                       if (self::isDirectoryUsable($spoolpath)) {
                                // The new path is usable, we are happy
                                DI::config()->set("system", "spoolpath", $spoolpath);
                                return $spoolpath;
index 62fd321c24b6a32d0800dac49979ebdea5ed765a..8abb8c178a185a0bad3282ac09b1804c579b2478 100644 (file)
@@ -104,7 +104,7 @@ class Worker
                        foreach ($r as $entry) {
                                // The work will be done
                                if (!self::execute($entry)) {
-                                       Logger::notice('Process execution failed, quitting.');
+                                       Logger::warning('Process execution failed, quitting.');
                                        return;
                                }
 
index 8df88e9e293c0db8b1c6342429c502388324203d..9db954298ad3b243e3bfbed71affad1685963986 100644 (file)
@@ -101,7 +101,7 @@ class Cron
                                // How long is the process already running?
                                $duration = (time() - strtotime($entry["executed"])) / 60;
                                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);
 
                                        // We killed the stale process.
index d14e791e2c5ed5f7cde01ce64104e6c2e58ff00c..2745f1cb8d6395a3102905dbf9587d7a85b66502 100644 (file)
@@ -119,7 +119,7 @@ class DBStructure
                $tables = array_merge($tables, DBA::selectToArray(
                        'information_schema.tables',
                        ['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)) {
index 8c8a25b6d4889586bb3512e45d87607aaae25579..0408ea78a71a34b74c5f5f90118c942b1af74ffa 100644 (file)
@@ -1299,7 +1299,7 @@ class Contact
                        }
 
                        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;
                        }
                } else {
index ed520f25ffea9c915f7b060b98b5da0b572337b6..b8fd3aa95b671bdc22611024b2743ecfded4f36b 100644 (file)
@@ -108,7 +108,7 @@ class Relation
                                $followings = [];
                        }
                } 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 = [];
                        $followings = [];
                }
index eb150da454c0a2dd6b46c7d791cd740bbee9568b..5a3af646ecaf0fedeffae3d7f0ad7161e4285384 100644 (file)
@@ -279,7 +279,7 @@ class Item
                        if ($item['uid'] == $uid) {
                                self::markForDeletionById($item['id'], PRIORITY_HIGH);
                        } 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);
@@ -580,7 +580,7 @@ class Item
                if (!empty($item['uid'])) {
                        $owner = User::getOwnerDataById($item['uid'], false);
                        if (!$owner) {
-                               Logger::notice('Missing item user owner data', ['uid' => $item['uid']]);
+                               Logger::warning('Missing item user owner data', ['uid' => $item['uid']]);
                                return false;
                        }
 
@@ -2515,7 +2515,7 @@ class Item
 
                $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
                if (!DBA::isResult($item)) {
-                       Logger::notice('like: unknown item', ['id' => $item_id]);
+                       Logger::warning('Post had not been fetched', ['id' => $item_id]);
                        return false;
                }
 
@@ -2581,7 +2581,7 @@ class Item
                                $activity = Activity::ANNOUNCE;
                                break;
                        default:
-                               Logger::notice('unknown verb', ['verb' => $verb, 'item' => $item_id]);
+                               Logger::warning('unknown verb', ['verb' => $verb, 'item' => $item_id]);
                                return false;
                }
 
index afe3a3227ae620f1a80001cb8698f3191c98356a..e494119cb8d9731b26114a931643d6b09af22629 100644 (file)
@@ -186,7 +186,7 @@ class Mail
                }
 
                if (!$convid) {
-                       Logger::notice('send message: conversation not found.');
+                       Logger::warning('conversation not found.');
                        return -4;
                }
 
@@ -290,7 +290,7 @@ class Mail
                }
 
                if (!$convid) {
-                       Logger::notice('send message: conversation not found.');
+                       Logger::warning('conversation not found.');
                        return -4;
                }
 
index 096915523c6c6c3022429f2563073bd04a83fb08..287fc65ad1d228783071c36b2fd13ad272dc9525 100644 (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);
                if (!$r) {
-                       Logger::notice('Photo could not be stored');
+                       Logger::warning('Photo could not be stored');
                        return [];
                }
 
@@ -1182,7 +1182,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 4, self::USER_AVATAR);
                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) {
@@ -1191,7 +1191,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 5, self::USER_AVATAR);
                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) {
@@ -1200,7 +1200,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 6, self::USER_AVATAR);
                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');
@@ -1257,7 +1257,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 3, self::USER_BANNER);
                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');
index 59fbb491e80f511231507e883736bb97b07bd8e4..4b1d70ae96eb90ad2214d567a3f43ab3eac678bf 100644 (file)
@@ -533,7 +533,7 @@ class Post
                                $puids = array_column($rows, 'post-user-id');
                                if (!DBA::update('post-user', $update_fields, ['id' => $puids])) {
                                        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;
                                }
                                $affected_count += DBA::affectedRows();
@@ -550,7 +550,7 @@ class Post
                                $uriids = array_column($rows, 'uri-id');
                                if (!DBA::update('post-content', $update_fields, ['uri-id' => $uriids])) {
                                        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;
                                }
                                $affected_count += DBA::affectedRows();
@@ -573,7 +573,7 @@ class Post
 
                                if (!DBA::update('post', $update_fields, ['uri-id' => $uriids])) {
                                        DBA::rollback();
-                                       Logger::notice('Updating post failed', ['fields' => $update_fields, 'condition' => $condition]);
+                                       Logger::warning('Updating post failed', ['fields' => $update_fields, 'condition' => $condition]);
                                        return false;
                                }
                                $affected_count += DBA::affectedRows();
@@ -590,7 +590,7 @@ class Post
                                $uriids = array_column($rows, 'uri-id');
                                if (!DBA::update('post-delivery-data', $update_fields, ['uri-id' => $uriids])) {
                                        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;
                                }
                                $affected_count += DBA::affectedRows();
@@ -607,7 +607,7 @@ class Post
                                $uriids = array_column($rows, 'uri-id');
                                if (!DBA::update('post-thread', $update_fields, ['uri-id' => $uriids])) {
                                        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;
                                }
                                $affected_count += DBA::affectedRows();
@@ -624,7 +624,7 @@ class Post
                                $thread_puids = array_column($rows, 'post-user-id');
                                if (!DBA::update('post-thread-user', $update_fields, ['post-user-id' => $thread_puids])) {
                                        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;
                                }
                                $affected_count += DBA::affectedRows();
index 38f1f52b9c601c6a2b38f73d95f84d32d9f36b99..4f1bec61c9f3a19141a049d0989226269f5a3ca9 100644 (file)
@@ -82,7 +82,7 @@ class Delivery
                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]]);
                        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);
                                return true;
                        } else {
index 80e92fa1510197fd3c2d058254d8933d08af1f72..434af898081ea999cf51b0500c43721d6c072c43 100644 (file)
@@ -747,7 +747,7 @@ class DFRN
                $mentioned = [];
 
                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;
                }
 
@@ -1466,9 +1466,8 @@ class DFRN
 
                // update contact
                $old = Contact::selectFirst(['photo', 'url'], ['id' => $importer['id'], 'uid' => $importer['importer_uid']]);
-
                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;
                }
 
@@ -1550,24 +1549,9 @@ class DFRN
        private static function getEntryType(array $importer, array $item): int
        {
                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?
                        // Specifically, the recipient?
-                       $parent = Post::selectFirst(['wall'],
-                               ["`uri` = ? AND `uid` = ?" . $sql_extra, $item['thr-parent'], $importer['importer_uid']]);
-
-                       $is_a_remote_action = DBA::isResult($parent);
-
-                       if ($is_a_remote_action) {
+                       if (Post::exists(['uri' => $item['thr-parent'], 'uid' => $importer['importer_uid'], 'self' => true, 'wall' => true])) {
                                return DFRN::REPLY_RC;
                        } else {
                                return DFRN::REPLY;
@@ -1665,9 +1649,8 @@ class DFRN
 
                                if ($xt->type == Activity\ObjectType::NOTE) {
                                        $item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer['importer_uid']]);
-
                                        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;
                                        }
 
index c12912f6813f51e0603e32caa98a33eef88d4613..45798cc579876697170e247afeaca75314913569 100644 (file)
@@ -475,7 +475,7 @@ class Diaspora
                }
 
                if (!($fields = self::validPosting($msg))) {
-                       Logger::notice('Invalid posting');
+                       Logger::warning('Invalid posting');
                        return false;
                }
 
@@ -510,7 +510,7 @@ class Diaspora
                if (is_null($fields)) {
                        $private = true;
                        if (!($fields = self::validPosting($msg))) {
-                               Logger::notice('Invalid posting');
+                               Logger::warning('Invalid posting');
                                return false;
                        }
                } else {
@@ -1711,7 +1711,7 @@ class Diaspora
                        }
                }
                if (!$conversation) {
-                       Logger::notice('Unable to create conversation.');
+                       Logger::warning('Unable to create conversation.');
                        return false;
                }
 
@@ -3644,7 +3644,7 @@ class Diaspora
                                $attend_answer = 'tentative';
                                break;
                        default:
-                               Logger::notice('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']);
+                               Logger::warning('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']);
                                return false;
                }
 
index 577760a253e0b7a24400998fe2d1dd287a648869..bcde2b4e294e016fff813b5fa78f0644661ef072 100644 (file)
@@ -51,12 +51,12 @@ class Email
 
                $errors = imap_errors();
                if (!empty($errors)) {
-                       Logger::notice('IMAP Errors occured', ['errors' => $errors]);
+                       Logger::warning('IMAP Errors occured', ['errors' => $errors]);
                }
 
                $alerts = imap_alerts();
                if (!empty($alerts)) {
-                       Logger::notice('IMAP Alerts occured: ', ['alerts' => $alerts]);
+                       Logger::warning('IMAP Alerts occured: ', ['alerts' => $alerts]);
                }
 
                return $mbox;
@@ -78,21 +78,21 @@ class Email
                if (!$search1) {
                        $search1 = [];
                } 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);
                if (!$search2) {
                        $search2 = [];
                } 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);
                if (!$search3) {
                        $search3 = [];
                } else {
-                       Logger::notice("Found mails cc ".$email_addr);
+                       Logger::debug("Found mails cc ".$email_addr);
                }
 
                $res = array_unique(array_merge($search1, $search2, $search3));
index 41cd16d2f41464bc692a63963b6109ba1e37dee1..872b95228fab63a849e527b9b5dc0ad58f46f670 100644 (file)
@@ -158,7 +158,7 @@ class DateTimeFormat
                try {
                        $d = new DateTime($s, $from_obj);
                } catch (Exception $e) {
-                       Logger::notice('DateTimeFormat::convert: exception: ' . $e->getMessage());
+                       Logger::warning('DateTimeFormat::convert: exception: ' . $e->getMessage());
                        $d = new DateTime('now', $from_obj);
                }
 
index 0b4bf9c9594fd2ffc97f0a66b642bd53f0503e68..4611cf8efe5f25378caa699044543af6269bab4c 100644 (file)
@@ -214,7 +214,7 @@ class ParseUrl
                ];
 
                if ($count > 10) {
-                       Logger::notice('Endless loop detected', ['url' => $url]);
+                       Logger::warning('Endless loop detected', ['url' => $url]);
                        return $siteinfo;
                }
 
index c2721d24716a479e6875b6f99c56bfa8df613995..7933f4415b6f9a21677cffe7e090e24c7dd278f2 100644 (file)
@@ -270,7 +270,7 @@ class XML
                }
 
                if (!function_exists('xml_parser_create')) {
-                       Logger::notice('Xml::toArray: parser function missing');
+                       Logger::error('Xml::toArray: parser function missing');
                        return [];
                }
 
@@ -285,8 +285,8 @@ class XML
                        $parser = @xml_parser_create();
                }
 
-               if (! $parser) {
-                       Logger::notice('Xml::toArray: xml_parser_create: no resource');
+               if (!$parser) {
+                       Logger::warning('Xml::toArray: xml_parser_create: no resource');
                        return [];
                }
 
index f1acd8fd4181cc9da69c79dce13582b8c3b726db..786f71a664282f7dab0c603bb035cc8521d13792 100644 (file)
@@ -103,12 +103,12 @@ class Delivery
                        DBA::close($itemdata);
 
                        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;
                        }
 
                        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);
                                return;
                        }
@@ -182,7 +182,7 @@ class Delivery
                }
 
                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);
@@ -432,7 +432,7 @@ class Delivery
                        Logger::notice('diaspora status: ' . $loc);
                        $deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
                } else {
-                       Logger::notice('Unknown mode ' . $cmd . ' for ' . $loc);
+                       Logger::warning('Unknown mode', ['command' => $cmd, 'target' => $loc]);
                        return;
                }
 
index 719bd373c5dc3ab41e097dcf5436c4a950b95dd0..83a7a5f15c228c0bd6fc016cc5fd553c77192094 100644 (file)
@@ -394,7 +394,7 @@ class OnePoll
 
                                        $datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
                                        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;
                                        }
 
index 8adc7d76de22167cc08ab5f106ab2faa0acd4c3a..4591fb22bf5b7174a376b02b3d7487bd011f3be1 100644 (file)
@@ -56,7 +56,7 @@ class RemoveUnusedAvatars
                                        Logger::notice('We are outside of the maintenance window, quitting');
                                        return;
                                }
-                               Logger::notice('In removal', ['count' => $count, 'total' => $total]);
+                               Logger::info('In removal', ['count' => $count, 'total' => $total]);
                        }
                }
                DBA::close($contacts);
index 324ec2419f144584cf2772135b51e042941bc4b3..6a419963432f56409c8d118714b01fe8954f523f 100644 (file)
@@ -80,7 +80,7 @@ class RemoveUnusedContacts
 
                        DBA::delete('contact', ['id' => $contact['id']]);
                        if ((++$count % 1000) == 0) {
-                               Logger::notice('In removal', ['count' => $count, 'total' => $total]);
+                               Logger::info('In removal', ['count' => $count, 'total' => $total]);
                        }
                }
                DBA::close($contacts);
index 884c5fd49a87cf7a71547f8bfe934ede4410df38..ee5412d7f34375a94ab0ed7a167febd444a90154 100644 (file)
@@ -38,7 +38,7 @@ class SpoolPost {
 
                                        // It is not named like a spool file, so we don't care.
                                        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;
                                        }
 
@@ -46,13 +46,13 @@ class SpoolPost {
 
                                        // We don't care about directories either
                                        if (filetype($fullfile) != "file") {
-                                               Logger::notice('Spool file is no file', ['file' => $file]);
+                                               Logger::info('Spool file is no file', ['file' => $file]);
                                                continue;
                                        }
 
                                        // We can't read or write the file? So we don't care about it.
                                        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;
                                        }
 
@@ -66,13 +66,13 @@ class SpoolPost {
 
                                        // Skip if it doesn't seem to be an item array
                                        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;
                                        }
 
                                        $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);
                                }
                                closedir($dh);
index ff888dac6155bae776026f582502a424b9f35299..74975893ce8ac6d17a288a2562d94ee58f6cfdad 100644 (file)
@@ -49,8 +49,7 @@ foreach (['style', $style] as $file) {
                        $modified = $stylemodified;
                }
        } else {
-               //TODO: use Logger::ERROR?
-               Logger::notice('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+               Logger::warning('Missing CSS file', ['file' => $stylecssfile, 'uid' => $uid]);
        }
 }
 $modified = gmdate('r', $modified);