diff --git a/lib/GroupHelper.php b/lib/GroupHelper.php index 10d56c56c..b44b9aa99 100644 --- a/lib/GroupHelper.php +++ b/lib/GroupHelper.php @@ -61,23 +61,31 @@ public function addEvent(int $id, IEvent $event): void { } else { $event = $provider->parse($language, $event); } + + if ($event->isValidParsed()) { + $this->logger->info('Activity event was claimed to be parsed, but was not fully parsed by ' . get_class($provider) . ' [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']', ['app' => $event->getApp()]); + } } catch (UnknownActivityException) { } catch (\InvalidArgumentException) { // todo 33.0.0 Log as warning // todo 39.0.0 Log as error - $this->logger->debug(get_class($provider) . '::parse() threw \InvalidArgumentException which is deprecated. Throw \OCP\Activity\Exceptions\UnknownActivityException when the event is not known to your provider and otherwise handle all \InvalidArgumentException yourself.'); + $this->logger->debug(get_class($provider) . '::parse() threw \InvalidArgumentException which is deprecated. Throw \OCP\Activity\Exceptions\UnknownActivityException when the event is not known to your provider and otherwise handle all \InvalidArgumentException yourself.', ['app' => $event->getApp()]); } catch (\Throwable $e) { - $this->logger->error('Error while parsing activity event', ['exception' => $e]); + $this->logger->error('Error while parsing activity event', ['exception' => $e, 'app' => $event->getApp()]); } } + if ($event->isValidParsed()) { + $this->logger->info('Activity event was not parsed by any provider [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']', ['app' => $event->getApp()]); + } + try { $this->richObjectValidator->validate($event->getRichSubject(), $event->getRichSubjectParameters()); } catch (InvalidObjectExeption $e) { $this->logger->error( - $e->getMessage(), + 'Activity event had invalid subject parameters provided [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']', [ - 'app' => 'activity', + 'app' => $event->getApp(), 'exception' => $e ], ); @@ -90,9 +98,9 @@ public function addEvent(int $id, IEvent $event): void { $this->richObjectValidator->validate($event->getRichMessage(), $event->getRichMessageParameters()); } catch (InvalidObjectExeption $e) { $this->logger->error( - $e->getMessage(), + 'Activity event had invalid message parameters provided [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']', [ - 'app' => 'activity', + 'app' => $event->getApp(), 'exception' => $e ], ); @@ -109,7 +117,7 @@ public function addEvent(int $id, IEvent $event): void { } if (!$event->getParsedSubject()) { - $this->logger->debug('Activity "' . $event->getRichSubject() . '" was not parsed by any provider'); + $this->logger->debug('Activity "' . $event->getRichSubject() . '" was not parsed by any provider', ['app' => $event->getApp()]); return; }