Skip to content

[9.x] Add capability to Ignore Exceptions if Broadcast fails #38860

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.

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

Closed
wants to merge 1 commit into from
Closed
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
17 changes: 13 additions & 4 deletions src/Illuminate/Broadcasting/BroadcastEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Broadcasting\Factory as BroadcastingFactory;
use Illuminate\Broadcasting\BroadcastException;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Support\Arr;
Expand Down Expand Up @@ -72,10 +73,18 @@ public function handle(BroadcastingFactory $manager)

$payload = $this->getPayloadFromEvent($this->event);

foreach ($connections as $connection) {
$manager->connection($connection)->broadcast(
$channels, $name, $payload
);
try {
foreach ($connections as $connection) {
$manager->connection($connection)->broadcast(
$channels, $name, $payload
);
}
} catch (BroadcastException $e) {
if ($manager->getApplication()['config']['broadcasting.ignore_exceptions'] ?? false) {
return;
}

throw $e;
}
}

Expand Down
13 changes: 11 additions & 2 deletions src/Illuminate/Broadcasting/Broadcasters/AblyBroadcaster.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Broadcasting\Broadcasters;

use Ably\AblyRest;
use Ably\Exceptions\AblyException;
use Illuminate\Support\Str;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;

Expand Down Expand Up @@ -117,11 +118,19 @@ public function generateAblySignature($channelName, $socketId, $userData = null)
* @param string $event
* @param array $payload
* @return void
*
* @throws \Illuminate\Broadcasting\BroadcastException
*/
public function broadcast(array $channels, $event, array $payload = [])
{
foreach ($this->formatChannels($channels) as $channel) {
$this->ably->channels->get($channel)->publish($event, $payload);
try {
foreach ($this->formatChannels($channels) as $channel) {
$this->ably->channels->get($channel)->publish($event, $payload);
}
} catch (AblyException $e) {
throw new BrodcastException(
sprintf('Ably error: %s', $e->getMessage())
)
}
}

Expand Down
19 changes: 15 additions & 4 deletions src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

namespace Illuminate\Broadcasting\Broadcasters;

use Illuminate\Broadcasting\BroadcastException;
use Illuminate\Contracts\Redis\Factory as Redis;
use Illuminate\Support\Arr;
use Predis\Connection\ConnectionException;
use RedisException;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;

class RedisBroadcaster extends Broadcaster
Expand Down Expand Up @@ -105,6 +108,8 @@ public function validAuthenticationResponse($request, $result)
* @param string $event
* @param array $payload
* @return void
*
* @throws \Illuminate\Broadcasting\BroadcastException
*/
public function broadcast(array $channels, $event, array $payload = [])
{
Expand All @@ -120,10 +125,16 @@ public function broadcast(array $channels, $event, array $payload = [])
'socket' => Arr::pull($payload, 'socket'),
]);

$connection->eval(
$this->broadcastMultipleChannelsScript(),
0, $payload, ...$this->formatChannels($channels)
);
try {
$connection->eval(
$this->broadcastMultipleChannelsScript(),
0, $payload, ...$this->formatChannels($channels)
);
} catch (ConnectionException|RedisException $e) {
throw new BroadcastException(
sprintf('Redis error: %s.', $e->getMessage())
);
}
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/Illuminate/Contracts/Broadcasting/Broadcaster.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public function validAuthenticationResponse($request, $result);
* @param string $event
* @param array $payload
* @return void
*
* @throws \Illuminate\Broadcasting\BroadcastException
*/
public function broadcast(array $channels, $event, array $payload = []);
}