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

nitpick

This commit is contained in:
freek 2018-11-30 15:52:11 +01:00
parent 13aec0af19
commit dc87bfb221
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Console/StartWebSocketServer.php
View File

@ -5,7 +5,7 @@ namespace BeyondCode\LaravelWebSockets\Console;
use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter;
use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger; use BeyondCode\LaravelWebSockets\Server\Logger\ConnectionLogger;
use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger; use BeyondCode\LaravelWebSockets\Server\Logger\HttpLogger;
use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketLogger; use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory; use BeyondCode\LaravelWebSockets\Server\WebSocketServerFactory;
@ -40,8 +40,8 @@ class StartWebSocketServer extends Command
protected function configureMessageLogger() protected function configureMessageLogger()
{ {
app()->singleton(WebsocketLogger::class, function() { app()->singleton(WebsocketsLogger::class, function() {
return (new WebsocketLogger($this->output)) return (new WebsocketsLogger($this->output))
->enable(config('app.debug')) ->enable(config('app.debug'))
->verbose($this->output->isVerbose()); ->verbose($this->output->isVerbose());
}); });

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

@ -18,7 +18,7 @@ class Logger
public static function isEnabled(): bool public static function isEnabled(): bool
{ {
return app(WebsocketLogger::class)->enabled; return app(WebsocketsLogger::class)->enabled;
} }
public function __construct(OutputInterface $consoleOutput) public function __construct(OutputInterface $consoleOutput)

6
src/Server/Logger/WebsocketLogger.php → src/Server/Logger/WebsocketsLogger.php
View File

@ -8,14 +8,14 @@ use Ratchet\ConnectionInterface;
use Ratchet\RFC6455\Messaging\MessageInterface; use Ratchet\RFC6455\Messaging\MessageInterface;
use Ratchet\WebSocket\MessageComponentInterface; use Ratchet\WebSocket\MessageComponentInterface;
class WebsocketLogger extends Logger implements MessageComponentInterface class WebsocketsLogger extends Logger implements MessageComponentInterface
{ {
/** @var \Ratchet\Http\HttpServerInterface */ /** @var \Ratchet\Http\HttpServerInterface */
protected $app; protected $app;
public static function decorate(MessageComponentInterface $app): WebsocketLogger public static function decorate(MessageComponentInterface $app): WebsocketsLogger
{ {
$logger = app(WebsocketLogger::class); $logger = app(WebsocketsLogger::class);
return $logger->setApp($app); return $logger->setApp($app);
} }

6
src/Server/Router.php
View File

@ -2,7 +2,7 @@
namespace BeyondCode\LaravelWebSockets\Server; namespace BeyondCode\LaravelWebSockets\Server;
use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketLogger; use BeyondCode\LaravelWebSockets\Server\Logger\WebsocketsLogger;
use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController;
use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController;
use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController; use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController;
@ -97,8 +97,8 @@ class Router
{ {
$app = app($action); $app = app($action);
if (WebsocketLogger::isEnabled()) { if (WebsocketsLogger::isEnabled()) {
$app = WebsocketLogger::decorate($app); $app = WebsocketsLogger::decorate($app);
} }
return new WsServer($app); return new WsServer($app);