diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php index aba33070..c6c7f64e 100644 --- a/app/Http/Controllers/Frontend/HomeController.php +++ b/app/Http/Controllers/Frontend/HomeController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Frontend; use App\Interfaces\Controller; use App\Models\User; use Illuminate\Database\QueryException; +use Log; /** * Class HomeController @@ -18,6 +19,12 @@ class HomeController extends Controller { try { $users = User::orderBy('created_at', 'desc')->take(4)->get(); + debug($users); + } catch (\PDOException $e) { + Log::emergency($e); + return view('system/errors/database_error', [ + 'error' => $e->getMessage(), + ]); } catch (QueryException $e) { return view('system/errors/not_installed'); } diff --git a/docker-compose.yml b/docker-compose.yml index 95962591..e6c720a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,3 +36,13 @@ services: - ./docker/data/mysql:/var/lib/mysql ports: - 3306:3306 + + # Use this to tail the logs so it's just all in a single window + logs: + image: busybox + command: tail -f /var/www/storage/logs/laravel.log + restart: always + volumes: + - ./:/var/www + depends_on: + - app diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 791d094a..5c3d4984 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,3 +1,13 @@ FROM php:7.3-fpm -RUN docker-php-ext-install mysqli pdo openssl mbstring tokenizer curl json gmp +RUN docker-php-ext-install \ + mysqli \ + pdo \ + openssl \ + mbstring \ + tokenizer \ + curl \ + json \ + gmp + +RUN ln -sf /dev/stderr /var/log/fpm-error.log diff --git a/docker/php/www.conf b/docker/php/www.conf index 57a5e5dd..725d0d2c 100644 --- a/docker/php/www.conf +++ b/docker/php/www.conf @@ -10,3 +10,6 @@ pm.max_children = 5 pm.start_servers = 2 pm.min_spare_servers = 1 pm.max_spare_servers = 3 + +php_flag[display_errors] = on +php_admin_flag[log_errors] = on diff --git a/resources/views/system/errors/database_error.blade.php b/resources/views/system/errors/database_error.blade.php index cd36701e..fa8de3e7 100644 --- a/resources/views/system/errors/database_error.blade.php +++ b/resources/views/system/errors/database_error.blade.php @@ -62,7 +62,7 @@

Database Error

- @yield('content') + {{ $error }}