Skip to content

fix: Improving logging of invalid parameters for activity subject and… #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Apr 14, 2025
Merged

fix: Improving logging of invalid parameters for activity subject and… #1975

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad3856
fix: Improving logging of invalid parameters for activity subject and…
nickvergessen Apr 9, 2025
2e6501c
fix: Log with the app that should cause this
nickvergessen Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: Log with the app that should cause this 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Apr 11, 2025
commit 2e6501cd1a4ae9d969755e5d7f324b0eefefa9ed
14 changes: 7 additions & 7 deletions lib/GroupHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ public function addEvent(int $id, IEvent $event): void {
}

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() . ']');
$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() . ']');
$this->logger->info('Activity event was not parsed by any provider [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']', ['app' => $event->getApp()]);
}

try {
Expand All @@ -85,7 +85,7 @@ public function addEvent(int $id, IEvent $event): void {
$this->logger->error(
'Activity event had invalid subject parameters provided [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']',
[
'app' => 'activity',
'app' => $event->getApp(),
'exception' => $e
],
);
Expand All @@ -100,7 +100,7 @@ public function addEvent(int $id, IEvent $event): void {
$this->logger->error(
'Activity event had invalid message parameters provided [app: ' . $event->getApp() . ', subject: ' . $event->getSubject() . ']',
[
'app' => 'activity',
'app' => $event->getApp(),
'exception' => $e
],
);
Expand All @@ -117,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;
}

Expand Down
Loading