From 7158b35f58a3269e57350c2cde394921de2109cc Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 16 Aug 2021 15:23:34 +0000 Subject: [PATCH] Added logging, removed superfluous comments --- src/Model/Subscription.php | 6 ------ src/Worker/PushSubscription.php | 17 ++++++++++++++--- static/defaults.config.php | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/Model/Subscription.php b/src/Model/Subscription.php index 5fb88911a..e3bbadcbf 100644 --- a/src/Model/Subscription.php +++ b/src/Model/Subscription.php @@ -19,18 +19,12 @@ * */ - /** - * @see https://github.com/web-push-libs/web-push-php - * Possibly we should simply use this. - */ - namespace Friendica\Model; use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Util\Crypto; use Minishlink\WebPush\VAPID; class Subscription diff --git a/src/Worker/PushSubscription.php b/src/Worker/PushSubscription.php index f3c3a4046..f740410e0 100644 --- a/src/Worker/PushSubscription.php +++ b/src/Worker/PushSubscription.php @@ -34,8 +34,19 @@ class PushSubscription { public static function execute(int $sid, int $nid) { + Logger::info('Start', ['subscription' => $sid, 'notification' => $nid]); + $subscription = DBA::selectFirst('subscription', [], ['id' => $sid]); + if (empty($subscription)) { + Logger::info('Subscription not found', ['subscription' => $sid]); + return; + } + $notification = DBA::selectFirst('notification', [], ['id' => $nid]); + if (empty($notification)) { + Logger::info('Notification not found', ['notification' => $nid]); + return; + } if (!empty($notification['uri-id'])) { $notify = DBA::selectFirst('notify', ['msg'], ['uri-id' => $notification['target-uri-id']]); @@ -71,7 +82,7 @@ class PushSubscription ], ]; - $webPush = new WebPush($auth); + $webPush = new WebPush($auth, [], DI::config()->get('system', 'xrd_timeout')); $report = $webPush->sendOneNotification( $push['subscription'], @@ -81,9 +92,9 @@ class PushSubscription $endpoint = $report->getRequest()->getUri()->__toString(); if ($report->isSuccess()) { - Logger::info('Message sent successfully for subscription', ['endpoint' => $endpoint]); + Logger::info('Message sent successfully for subscription', ['subscription' => $sid, 'notification' => $nid, 'endpoint' => $endpoint]); } else { - Logger::info('Message failed to sent for subscription', ['endpoint' => $endpoint, 'reason' => $report->getReason()]); + Logger::info('Message failed to sent for subscription', ['subscription' => $sid, 'notification' => $nid, 'endpoint' => $endpoint, 'reason' => $report->getReason()]); } } } diff --git a/static/defaults.config.php b/static/defaults.config.php index 20f351ab0..b405d5f5e 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -568,7 +568,7 @@ return [ 'worker_defer_limit' => 15, // xrd_timeout (Integer) - // Timeout in seconds for fetching the XRD links. + // Timeout in seconds for fetching the XRD links and other requests with an expected shorter timeout 'xrd_timeout' => 20, ], 'experimental' => [