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

Merge branch 'master' of github.com:beyondcode/laravel-websockets

This commit is contained in:
Marcel Pociot 2018-11-27 21:46:13 +01:00
parent 1825330407 141c87984a
commit 2a33b5ec1f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Server/Logger/WebsocketLogger.php
View File

@ -56,7 +56,7 @@ class WebsocketLogger extends Logger implements MessageComponentInterface
$appId = $connection->client->appId ?? 'Unknown app id'; $appId = $connection->client->appId ?? 'Unknown app id';
$message = "{$appId}: exception `{$exceptionClass}` thrown: `{$exception->getMessage()}`"; $message = "{$appId}: exception `{$exceptionClass}` thrown: `{$exception->getMessage()}`.";
if ($this->verbose) { if ($this->verbose) {
$message .= $exception->getTraceAsString(); $message .= $exception->getTraceAsString();

6
src/WebSockets/Channels/ChannelManager.php
View File

@ -51,8 +51,14 @@ class ChannelManager
return; return;
} }
/**
* Remove the connection from all channels.
*/
collect($this->channels[$connection->client->appId])->each->unsubscribe($connection); collect($this->channels[$connection->client->appId])->each->unsubscribe($connection);
/**
* Unset all channels that have no connections so we don't leak memory.
*/
collect($this->channels[$connection->client->appId]) collect($this->channels[$connection->client->appId])
->reject->hasConnections() ->reject->hasConnections()
->each(function (Channel $channel, string $channelId) use ($connection) { ->each(function (Channel $channel, string $channelId) use ($connection) {