Fix

spiral · May 31, 2023 · 3159ad1 · 3159ad1
1 parent eb0be48
commit 3159ad1
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 364 deletions.
diff --git a/centrifugo/.rr.yaml b/centrifugo/.rr.yaml
@@ -18,3 +18,7 @@ centrifuge:
 
 metrics:
     address: 0.0.0.0:2112
+
+status:
+    address: 127.0.0.1:2114
+    unavailable_status_code: 503
diff --git a/centrifugo/app.php b/centrifugo/app.php
@@ -19,7 +19,6 @@
 // Initialize shared container, bindings, directories and etc.
 $app = App::create(
     directories: ['root' => __DIR__],
-    exceptionHandler: \App\Exception\Handler::class
 )->run();
 
 if ($app === null) {

diff --git a/centrifugo/app/src/Bootloader/ExceptionHandlerBootloader.php b/centrifugo/app/src/Bootloader/ExceptionHandlerBootloader.php
@@ -4,34 +4,19 @@
 
 namespace App\Bootloader;
 
-use App\ErrorHandler\ViewRenderer;
-use App\Exception\CollisionRenderer;
-use Spiral\Boot\AbstractKernel;
 use Spiral\Boot\Bootloader\Bootloader;
-use Spiral\Exceptions\ExceptionHandler;
 use Spiral\Exceptions\ExceptionHandlerInterface;
-use Spiral\Exceptions\Renderer\JsonRenderer;
 use Spiral\Exceptions\Reporter\FileReporter;
 use Spiral\Exceptions\Reporter\LoggerReporter;
-use Spiral\Http\ErrorHandler\RendererInterface;
 use Spiral\Http\Middleware\ErrorHandlerMiddleware\EnvSuppressErrors;
 use Spiral\Http\Middleware\ErrorHandlerMiddleware\SuppressErrorsInterface;
-use Spiral\Ignition\IgnitionRenderer;
 
 final class ExceptionHandlerBootloader extends Bootloader
 {
     protected const BINDINGS = [
         SuppressErrorsInterface::class => EnvSuppressErrors::class,
     ];
 
-    public function init(AbstractKernel $kernel): void
-    {
-        $kernel->running(static function (ExceptionHandler $handler): void {
-            // $handler->addRenderer(new ConsoleRenderer());
-            $handler->addRenderer(new CollisionRenderer());
-        });
-    }
-
     public function boot(
         ExceptionHandlerInterface $handler,
         LoggerReporter $logger,

diff --git a/centrifugo/app/src/Exception/CollisionRenderer.php b/centrifugo/app/src/Exception/CollisionRenderer.php
diff --git a/centrifugo/app/src/Exception/Handler.php b/centrifugo/app/src/Exception/Handler.php
diff --git a/cinema/.rr.yaml b/cinema/.rr.yaml
@@ -49,3 +49,6 @@ metrics:
             type: counter
             help: "Canceled reservations"
 
+status:
+    address: 127.0.0.1:2114
+    unavailable_status_code: 503
diff --git a/cinema/app.php b/cinema/app.php
@@ -19,7 +19,6 @@
 // Initialize shared container, bindings, directories and etc.
 $app = App::create(
     directories: ['root' => __DIR__],
-    exceptionHandler: \App\Exception\Handler::class
 )->run();
 
 if ($app === null) {

diff --git a/cinema/app/src/Bootloader/ExceptionHandlerBootloader.php b/cinema/app/src/Bootloader/ExceptionHandlerBootloader.php
@@ -4,34 +4,19 @@
 
 namespace App\Bootloader;
 
-use App\ErrorHandler\ViewRenderer;
-use App\Exception\CollisionRenderer;
-use Spiral\Boot\AbstractKernel;
 use Spiral\Boot\Bootloader\Bootloader;
-use Spiral\Exceptions\ExceptionHandler;
 use Spiral\Exceptions\ExceptionHandlerInterface;
-use Spiral\Exceptions\Renderer\JsonRenderer;
 use Spiral\Exceptions\Reporter\FileReporter;
 use Spiral\Exceptions\Reporter\LoggerReporter;
-use Spiral\Http\ErrorHandler\RendererInterface;
 use Spiral\Http\Middleware\ErrorHandlerMiddleware\EnvSuppressErrors;
 use Spiral\Http\Middleware\ErrorHandlerMiddleware\SuppressErrorsInterface;
-use Spiral\Ignition\IgnitionRenderer;
 
 final class ExceptionHandlerBootloader extends Bootloader
 {
     protected const BINDINGS = [
         SuppressErrorsInterface::class => EnvSuppressErrors::class,
     ];
 
-    public function init(AbstractKernel $kernel): void
-    {
-        $kernel->running(static function (ExceptionHandler $handler): void {
-            // $handler->addRenderer(new ConsoleRenderer());
-            $handler->addRenderer(new CollisionRenderer());
-        });
-    }
-
     public function boot(
         ExceptionHandlerInterface $handler,
         LoggerReporter $logger,

diff --git a/cinema/app/src/Exception/CollisionRenderer.php b/cinema/app/src/Exception/CollisionRenderer.php
diff --git a/cinema/app/src/Exception/Handler.php b/cinema/app/src/Exception/Handler.php