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

View File

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

View File

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

View File

@ -8,14 +8,14 @@ use Ratchet\ConnectionInterface;
use Ratchet\RFC6455\Messaging\MessageInterface;
use Ratchet\WebSocket\MessageComponentInterface;
class WebsocketLogger extends Logger implements MessageComponentInterface
class WebsocketsLogger extends Logger implements MessageComponentInterface
{
/** @var \Ratchet\Http\HttpServerInterface */
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);
}

View File

@ -2,7 +2,7 @@
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\FetchChannelsController;
use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController;
@ -97,8 +97,8 @@ class Router
{
$app = app($action);
if (WebsocketLogger::isEnabled()) {
$app = WebsocketLogger::decorate($app);
if (WebsocketsLogger::isEnabled()) {
$app = WebsocketsLogger::decorate($app);
}
return new WsServer($app);