blax-software
/
laravel-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed $this->connection from RedisPusherBroadcaster

This commit is contained in:
Alex Renoki 2020-08-24 12:42:01 +03:00
parent e67fe3828d
commit d6b6135d7c
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Contracts/PushesToPusher.php
View File

@ -20,8 +20,7 @@ trait PushesToPusher
return new RedisPusherBroadcaster(
new Pusher($app['key'], $app['secret'], $app['id'], config('broadcasting.connections.websockets.options', [])),
$app['id'],
app('redis'),
config('broadcasting.connections.websockets.connection', null)
app('redis')
);
}

15
src/PubSub/Broadcasters/RedisPusherBroadcaster.php
View File

@ -35,27 +35,18 @@ class RedisPusherBroadcaster extends Broadcaster
*/
protected $redis;
/**
* The Redis connection to use for broadcasting.
*
* @var string|null
*/
protected $connection;
/**
* Create a new broadcaster instance.
*
* @param Pusher $pusher
* @param mixed $appId
* @param \Illuminate\Contracts\Redis\Factory $redis
* @param string|null $connection
*/
public function __construct(Pusher $pusher, $appId, Redis $redis, $connection = null)
public function __construct(Pusher $pusher, $appId, Redis $redis)
{
$this->pusher = $pusher;
$this->appId = $appId;
$this->redis = $redis;
$this->connection = $connection;
}
/**
@ -133,7 +124,9 @@ class RedisPusherBroadcaster extends Broadcaster
*/
public function broadcast(array $channels, $event, array $payload = [])
{
$connection = $this->redis->connection($this->connection);
$connection = $this->redis->connection(
config('websockets.replication.redis.connection') ?: 'default'
);
$payload = json_encode([
'appId' => $this->appId,

3
src/WebSocketsServiceProvider.php
View File

@ -105,8 +105,7 @@ class WebSocketsServiceProvider extends ServiceProvider
return new RedisPusherBroadcaster(
$pusher,
$config['app_id'],
$this->app->make('redis'),
$config['connection'] ?? null
$this->app->make('redis')
);
});
}