Remove potential new lines in reported logger instances

- Thanks to @MrKaplan-lw for the investigative work

diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index e43c75990184410dfacaf44acf723d629cc355cf..3e4df1e77bcb3982be4bc7ecf087fc664ad4e9f7 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -599,9 +599,7 @@ class Notify extends BaseRepository
                                        DBA::insert('notify-threads', $fields);
 
                                        $emailBuilder->setHeader('Message-ID', $message_id);
-                                       $log_msg = "No previous notification found for this parent:\n" .
-                                               "  parent: {$params['parent']}\n" . "  uid   : {$params['uid']}\n";
-                                       $this->logger->info($log_msg);
+                                       $this->logger->info('No previous notification found for this parent', ['parent' => $params['parent'], 'uid' => $params['uid']]);
                                } else {
                                        // If not, just "follow" the thread.
                                        $emailBuilder->setHeader('References', $message_id);

diff --git a/src/Protocol/Delivery.php b/src/Protocol/Delivery.php
index 6755f645d6cb5b48c1515546b6ea9b3747b59f69..d99b67c9a8c5a912ca901a6fb5812b05e0469985 100644 (file)
--- a/src/Protocol/Delivery.php
+++ b/src/Protocol/Delivery.php
@@ -310,7 +310,7 @@ class Delivery
                        $atom = DFRN::entries($msgitems, $owner);
                }
 
-               DI::logger()->debug('Notifier entry: ' . $contact['url'] . ' ' . ($target_item_id ?? 'relocation') . ' entry: ' . $atom);
+               DI::logger()->debug('Notifier entry', ['url' => $contact['url'], 'target_item_id' => ($target_item_id ?? 'relocation'), 'entry' => $atom]);
 
                $protocol = Post\DeliveryData::DFRN;
 

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 0235cb2f3fa11e78e11f2625c68b7c66b311a6ec..a8db02f045aecc476722a8d4f6c12000bf221219 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2790,7 +2790,7 @@ class Diaspora
         */
        public static function encodePrivateData(string $msg, array $user, array $contact, string $prvkey, string $pubkey): string
        {
-               DI::logger()->debug('Message: ' . $msg);
+               DI::logger()->debug('Diaspora message', ['msg' => $msg]);
 
                // without a public key nothing will work
                if (!$pubkey) {

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 0dc9f48f09c1ecc5a31578da4cb58f888a7fe156..1f0ded46cf97849054d969b1094e2d14fa1bd831 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -207,8 +207,7 @@ class Emailer
                        $hookdata['parameters']
                );
 
-               $this->logger->debug('header ' . 'To: ' . $email->getToAddress() . '\n' . $messageHeader);
-               $this->logger->debug('return value ' . (($res) ? 'true' : 'false'));
+               $this->logger->debug('Email message header', ['To' => $email->getToAddress(), 'messageHeader' => $messageHeader, 'return' => ($res) ? 'true' : 'false']);
 
                return $res;
        }