Merge d01627a into 077fcae

.server/nginx/site.conf

@@ -23,8 +23,8 @@ server {
     location = /robots.txt  { access_log off; log_not_found off; }
 
     # Stdout logging
-    error_log /dev/stdout info;
-    access_log /dev/stdout;
+    error_log /dev/stdout notice;
+    access_log off;
 
     # Remove index.php$
     if ($request_uri ~* "^(.*/)index\.php$") {

ansible/templates/production-compose.yml

@@ -17,6 +17,8 @@ services:
   web_server:
     image: "{{ DOCKER_APP_IMAGE }}:{{ APP_VERSION | default('latest', true) }}"
     restart: always
+    depends_on:
+      - redis_server
     environment:
       OVERRIDE_UMASK: "022"
       XDEBUG: "false"

ansible/templates/staging-compose.yml

@@ -18,6 +18,8 @@ services:
   web_server:
     image: "{{ DOCKER_APP_IMAGE }}:{{ APP_VERSION | default('latest', true) }}"
     restart: always
+    depends_on:
+      - redis_server
     environment:
       OVERRIDE_UMASK: "022"
       XDEBUG: "false"

app/Jobs/SendWelcomeEmail.php

@@ -8,10 +8,8 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Support\Facades\Log;
 
-class SendWelcomeEmail implements ShouldQueue
-{
+class SendWelcomeEmail implements ShouldQueue {
     use InteractsWithQueue, Queueable, SerializesModels;
 
     protected $user;
@@ -35,23 +33,13 @@ public function __construct(User $user)
      */
     public function handle(Mailer $mailer)
     {
-        try {
-            $mailer->send(
-                'emails.auth.welcome',
-                ['user' => $this->user],
-                function ($m) {
-                    $m->to($this->user->email, $this->user->name)
-                        ->subject(trans('emails.welcome.subject', ['siteName' => config('app.name')]));
-                }
-            );
-        } catch (\Swift_TransportException $e) {
-            Log::error(
-                'There was a problem with sending an welcome e-mail.',
-                [
-                    'email'   => $this->user->email,
-                    'message' => $e->getMessage()
-                ]
-            );
-        }
+        $mailer->send(
+            'emails.auth.welcome',
+            ['user' => $this->user],
+            function ($m) {
+                $m->to($this->user->email, $this->user->name)
+                    ->subject(trans('emails.welcome.subject', ['siteName' => config('app.name')]));
+            }
+        );
     }
 }

bootstrap/app.php

@@ -11,6 +11,9 @@
 |
 */
 
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+
 $app = new Illuminate\Foundation\Application(
     realpath(__DIR__.'/../')
 );
@@ -41,6 +44,31 @@
     App\Exceptions\Handler::class
 );
 
+/*
+|--------------------------------------------------------------------------
+| Override Monolog setup
+|--------------------------------------------------------------------------
+|
+| Sending logs to named pipe (FIFO) so we can forward it to docker logs
+|
+*/
+
+$app->configureMonologUsing(
+    function ($monolog) {
+        $levels = [
+            'debug'     => Logger::DEBUG,
+            'info'      => Logger::INFO,
+            'notice'    => Logger::NOTICE,
+            'warning'   => Logger::WARNING,
+            'error'     => Logger::ERROR,
+            'critical'  => Logger::CRITICAL,
+            'alert'     => Logger::ALERT,
+            'emergency' => Logger::EMERGENCY,
+        ];
+        $monolog->pushHandler(new StreamHandler('/tmp/laravel.log', $levels[config('app.log_level')]));
+    }
+);
+
 /*
 |--------------------------------------------------------------------------
 | Return The Application

database/migrations/2017_04_26_135124_create_failed_jobs_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFailedJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+}

docker-compose.yml

@@ -14,6 +14,9 @@ services:
   web_server:
     image: gzero/platform-container:v3
     restart: "no"
+    depends_on:
+      - db_server
+      - redis_server
     environment:
       OVERRIDE_UMASK: "002"
       XDEBUG: "true"