Merge branch '684-metager-fanshop-verlinken' into 'development'

Resolve "MetaGer Fanshop Verlinken"

Closes #684

See merge request !1176

.gitlab-ci.yml

@@ -29,11 +29,12 @@ update(144.76.113.134):
     - chmod -R 777 bootstrap/cache
     - npm install
     - ./gulpbuild.sh
+    - touch database/metager.sqlite
+    - php artisan migrate --force
     - if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
     - cd ~/
     - while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
     - mv MetaGer_neu MetaGer
-    - php ~/MetaGer/artisan migrate --force
     - sudo pkill --signal SIGHUP supervisord
     - php ~/MetaGer/artisan up
    
@@ -68,11 +69,12 @@ update(metager2):
     - chmod -R 777 bootstrap/cache
     - npm install
     - ./gulpbuild.sh
+    - touch database/metager.sqlite
+    - php artisan migrate --force
     - if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
     - cd ~/
     - while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
     - mv MetaGer_neu MetaGer
-    - php ~/MetaGer/artisan migrate --force
     - sudo pkill --signal SIGHUP supervisord
     - php ~/MetaGer/artisan up
     
@@ -107,10 +109,11 @@ update(metager3.de):
     - chmod -R 777 bootstrap/cache
     - npm install
     - ./gulpbuild.sh
+    - touch database/metager.sqlite
+    - php artisan migrate --force
     - if [ -f ~/MetaGer/artisan ]; then php ~/MetaGer/artisan down;fi
     - cd ~/
     - while [ -d ~/MetaGer ]; do rm -rf ~/MetaGer;done
     - mv MetaGer_neu MetaGer
-    - php ~/MetaGer/artisan migrate --force
     - sudo pkill --signal SIGHUP supervisord
     - php ~/MetaGer/artisan up
\ No newline at end of file

app/Models/Searchengine.php

@@ -243,7 +243,7 @@ abstract class Searchengine
                 Cache::put($this->hash, $body, $this->cacheDuration);
             }
         }
-        if ($body !== "") {
+        if ($body !== "" && $body !== "connected" && $body !== "waiting") {
             $this->loadResults($body);
             $this->getNext($metager, $body);
             $this->loaded = true;

database/migrations/2018_02_22_122047_create_failed_jobs_table.php

+<?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');
+    }
+}

readme.md

@@ -6,11 +6,15 @@
 
 ## Abhängigkeiten
 * composer (https://getcomposer.org/)
-* php7.0
-  * php7.0-mbstring
-  * php7.0-dom
-  * php7.0-xml
-  * php7.0-zip
+* php
+  * php-common
+  * php-curl
+  * php-mbstring
+  * php-mysql
+  * php-sqlite3
+  * php-xml
+  * php-zip
+  * php-redis
 * sqlite3
 * redis-server
 * Die Perl-Pakete