Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/Controller/RemoteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public function event(): DataResponse {

return new DataResponse($event->getOutcome());
} catch (Exception $e) {
$this->e($e, ['event' => $event]);
$this->e($e, ['event' => $event->getWrapperToken()]);

return $this->exceptionResponse($e);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/FederatedItems/MassiveMemberAdd.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function verify(FederatedEvent $event): void {
try {
$filtered[] = $this->generateMember($event, $circle, $member);
} catch (Exception $e) {
$this->e($e, ['event' => $event, 'circle' => $circle, 'member' => $member]);
$this->e($e, ['event' => $event->getWrapperToken()]);
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Service/FederatedEventService.php
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public function initBroadcast(FederatedEvent $event): void {
try {
$this->doRequest($request);
} catch (RequestNetworkException $e) {
$this->e($e, ['wrapper' => $wrapper]);
$this->e($e);
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Service/GlobalScaleService.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function getGlobalScaleInstances(): array {
try {
return $this->retrieveJson($request);
} catch (RequestNetworkException $e) {
$this->e($e, ['request' => $request]);
$this->e($e);
}
} catch (GSStatusException $e) {
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/MemberService.php
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public function insertOrUpdate(Member $member): bool {
$this->memberRequest->insertOrUpdate($member);
$this->membershipService->onUpdate($member->getSingleId());
} catch (FederatedUserException $e) {
$this->e($e, ['member' => $member]);
$this->e($e);

return false;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/RemoteDownstreamService.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public function incomingEvent(FederatedEvent $event): void {

$gs->manage($event);
} catch (Exception $e) {
$this->e($e, ['event' => $event]);
$this->e($e, ['event' => $event->getWrapperToken()]);
}
}

Expand Down
8 changes: 5 additions & 3 deletions lib/Service/RemoteStreamService.php
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,11 @@ private function confirmAuth(RemoteInstance $remote, string $auth): void {
$this->verifyString($auth, base64_decode($signed), $remote->getPublicKey(), $algo);
$remote->setIdentityAuthed(true);
} catch (SignatureException $e) {
$this->e(
$e,
['auth' => $auth, 'signed' => $signed, 'signatory' => $remote, 'msg' => 'auth not confirmed']
$this->e($e, [
'auth' => $auth,
'signed' => $signed,
'msg' => 'auth not confirmed'
]
);
throw new SignatureException('auth not confirmed');
}
Expand Down