Merge pull request #116 from dancryer/master

Fix database timeout issue with worker daemon.

Author: REBELinBLUE

.phpci.yml

@@ -61,7 +61,7 @@ complete:
     env:
         CODECLIMATE_REPO_TOKEN: "f5222770741fef12c55315f61a267c8a615908e511241618ce171129e8217e63"
     shell:
-        - "php /var/www/PHPCI/vendor/bin/phpunit --coverage-clover %BUILD_PATH%/storage/coverage/clover.xml -c %BUILD_PATH%/phpunit.xml %BUILD_PATH%/tests"
-        - "php /var/www/PHPCI/vendor/bin/test-reporter --coverage-report=%BUILD_PATH%/storage/coverage/clover.xml"
+        - "php /var/www/PHPCI/latest/vendor/bin/phpunit --coverage-clover %BUILD_PATH%/storage/coverage/clover.xml -c %BUILD_PATH%/phpunit.xml %BUILD_PATH%/tests"
+        - "php /var/www/PHPCI/latest/vendor/bin/test-reporter --coverage-report=%BUILD_PATH%/storage/coverage/clover.xml"
 
 success:

app/Deployment.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Lang;
 use REBELinBLUE\Deployer\Contracts\RuntimeInterface;
 use REBELinBLUE\Deployer\Events\ModelChanged;
@@ -316,4 +318,18 @@ public function getRepoFailureAttribute()
     {
         return ($this->commit === self::LOADING && $this->status === self::FAILED);
     }
+
+    /**
+     * A little hack to reconnect to the database if we're in console mode and trying to find a deployment.
+     * Should fix the error sending STMT_PREPARE problem that causes deployments to sit "pending" forever.
+     * @return mixed
+     */
+    public function findOrFail()
+    {
+        if (App::runningInConsole()) {
+            DB::reconnect();
+        }
+
+        return parent::__call('findOrFail', func_get_args());
+    }
 }