Skip to content

Commit b19c124

Browse files
committed
avoid exception loop
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
1 parent e7be60c commit b19c124

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

lib/Controller/RemoteController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public function event(): DataResponse {
200200

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

205205
return $this->exceptionResponse($e);
206206
}

lib/FederatedItems/MassiveMemberAdd.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function verify(FederatedEvent $event): void {
7676
try {
7777
$filtered[] = $this->generateMember($event, $circle, $member);
7878
} catch (Exception $e) {
79-
$this->e($e, ['event' => $event, 'circle' => $circle, 'member' => $member]);
79+
$this->e($e, ['event' => $event->getWrapperToken()]);
8080
}
8181
}
8282

lib/Service/FederatedEventService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public function initBroadcast(FederatedEvent $event): bool {
442442
try {
443443
$this->doRequest($request);
444444
} catch (RequestNetworkException $e) {
445-
$this->e($e, ['wrapper' => $wrapper]);
445+
$this->e($e);
446446
}
447447

448448
return true;

lib/Service/GlobalScaleService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function getGlobalScaleInstances(): array {
124124
try {
125125
return $this->retrieveJson($request);
126126
} catch (RequestNetworkException $e) {
127-
$this->e($e, ['request' => $request]);
127+
$this->e($e);
128128
}
129129
} catch (GSStatusException $e) {
130130
}

lib/Service/MemberService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public function insertOrUpdate(Member $member): bool {
360360
$this->memberRequest->insertOrUpdate($member);
361361
$this->membershipService->onUpdate($member->getSingleId());
362362
} catch (FederatedUserException $e) {
363-
$this->e($e, ['member' => $member]);
363+
$this->e($e);
364364

365365
return false;
366366
}

lib/Service/RemoteDownstreamService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function incomingEvent(FederatedEvent $event): void {
183183

184184
$gs->manage($event);
185185
} catch (Exception $e) {
186-
$this->e($e, ['event' => $event]);
186+
$this->e($e, ['event' => $event->getWrapperToken()]);
187187
}
188188
}
189189

lib/Service/RemoteStreamService.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,11 @@ private function confirmAuth(RemoteInstance $remote, string $auth): void {
492492
$this->verifyString($auth, base64_decode($signed), $remote->getPublicKey(), $algo);
493493
$remote->setIdentityAuthed(true);
494494
} catch (SignatureException $e) {
495-
$this->e(
496-
$e,
497-
['auth' => $auth, 'signed' => $signed, 'signatory' => $remote, 'msg' => 'auth not confirmed']
495+
$this->e($e, [
496+
'auth' => $auth,
497+
'signed' => $signed,
498+
'msg' => 'auth not confirmed'
499+
]
498500
);
499501
throw new SignatureException('auth not confirmed');
500502
}

0 commit comments

Comments
 (0)