diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbba90f7dcba6a4a2f961b1811c78bfc70cbd793..2e06f408921f0740dbbe286087a5d5d50dc7ea2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,7 @@ update(144.76.113.134): - if [ -d MetaGer_neu ]; then rm -rf MetaGer_neu;fi - git clone "$path" MetaGer_neu - cd MetaGer_neu - - composer update - - php artisan queue:restart + - composer install - scp metager@metager3.de:~/.env . - scp metager@metager3.de:~/sumas.xml config/ - scp metager@metager3.de:~/sumasEn.xml config/ @@ -25,13 +24,16 @@ update(144.76.113.134): - scp metager@metager3.de:~/blacklistDomains.txt config/ - touch storage/logs/laravel.log - touch storage/logs/worker.log - - chmod 777 config/sumas.xml config/sumasEn.xml + - chmod 777 config/sumas.xml config/sumasEn.xml database/metager.sqlite - chmod -R 777 storage - chmod -R 777 bootstrap/cache - - php artisan migrate + - php ~/MetaGer/artisan down - cd ~/ - rm -rf MetaGer - mv MetaGer_neu MetaGer + - php ~/MetaGer/artisan queue:restart + - php ~/MetaGer/artisan migrate --force + - php ~/MetaGer/artisan up update(metager3.de): tags: @@ -51,8 +53,7 @@ update(metager3.de): - if [ -d MetaGer_neu ]; then rm -rf MetaGer_neu;fi - git clone "$path" MetaGer_neu - cd MetaGer_neu - - composer update - - php artisan queue:restart + - composer install - scp metager@metager3.de:~/.env . - scp metager@metager3.de:~/sumas.xml config/ - scp metager@metager3.de:~/sumasEn.xml config/ @@ -60,10 +61,13 @@ update(metager3.de): - scp metager@metager3.de:~/blacklistDomains.txt config/ - touch storage/logs/laravel.log - touch storage/logs/worker.log - - chmod 777 config/sumas.xml config/sumasEn.xml + - chmod 777 config/sumas.xml config/sumasEn.xml database/metager.sqlite - chmod -R 777 storage - chmod -R 777 bootstrap/cache - - php artisan migrate + - php ~/MetaGer/artisan down - cd ~/ - rm -rf MetaGer - - mv MetaGer_neu MetaGer \ No newline at end of file + - mv MetaGer_neu MetaGer + - php ~/MetaGer/artisan queue:restart + - php ~/MetaGer/artisan migrate --force + - php ~/MetaGer/artisan up \ No newline at end of file diff --git a/app/Jobs/Search.php b/app/Jobs/Search.php index d5c4669f5b07e4229a55d53d5561781fdaef9e0a..6575b54f3649997b6c8fc9c22e1ac77afad29843 100644 --- a/app/Jobs/Search.php +++ b/app/Jobs/Search.php @@ -41,10 +41,7 @@ class Search extends Job implements ShouldQueue { $this->fp = $this->getFreeSocket(); - if(!$this->fp) - { - $this->disable($this->sumaFile, "Die Suchmaschine " . $this->name . " wurde für 1h deaktiviert, weil keine Verbindung aufgebaut werden konnte"); - }else + if($this->fp) { if($this->writeRequest()) {