diff --git a/app/Console/Commands/RequestFetcher.php b/app/Console/Commands/RequestFetcher.php index 4dfe2b535ebbb350c5abcbdcd10f21706bb0f3f8..3da6a2a9373b3d0a1befff4d4a8fe8ae4a9bc176 100644 --- a/app/Console/Commands/RequestFetcher.php +++ b/app/Console/Commands/RequestFetcher.php @@ -63,14 +63,13 @@ class RequestFetcher extends Command try { $blocking = false; - $redis = Redis::connection("cache"); while ($this->shouldRun) { $status = curl_multi_exec($this->multicurl, $active); $currentJob = null; if (!$blocking) { - $currentJob = $redis->lpop(\App\MetaGer::FETCHQUEUE_KEY); + $currentJob = Redis::lpop(\App\MetaGer::FETCHQUEUE_KEY); } else { - $currentJob = $redis->blpop(\App\MetaGer::FETCHQUEUE_KEY, 1); + $currentJob = Redis::blpop(\App\MetaGer::FETCHQUEUE_KEY, 1); if (!empty($currentJob)) { $currentJob = $currentJob[1]; } @@ -105,8 +104,11 @@ class RequestFetcher extends Command $body = \curl_multi_getcontent($info["handle"]); } - Cache::put($resulthash, $body, $cacheDurationMinutes * 60); - + Redis::pipeline(function ($pipe) use ($resulthash, $body, $cacheDurationMinutes) { + $pipe->set($resulthash, $body); + $pipe->expire($resulthash, 60); + Cache::put($resulthash, $body, $cacheDurationMinutes * 60); + }); \curl_multi_remove_handle($this->multicurl, $info["handle"]); } if (!$active && !$answerRead) { diff --git a/app/MetaGer.php b/app/MetaGer.php index dd19664bd442791ad9fbe6bb084756828988d763..47bcb73a9d50476bcf29cefafbdd7d26021704da 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -6,6 +6,7 @@ use App; use Cache; use Carbon; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Redis; use Jenssegers\Agent\Agent; use LaravelLocalization; use Log; @@ -853,7 +854,7 @@ class MetaGer while (sizeof($enginesToWaitFor) > 0 || ($forceTimeout !== null && (microtime(true) - $timeStart) < $forceTimeout)) { foreach ($enginesToWaitFor as $index => $engine) { - if (Cache::get($engine->hash) !== null) { + if (Redis::get($engine->hash) !== null) { $answered[] = $engine; unset($enginesToWaitFor[$index]); break; diff --git a/app/Models/Quicktips/Quicktips.php b/app/Models/Quicktips/Quicktips.php index b91b693110186c460d2ee6b6c03541c1ba8edc9a..06306dcde031b42f5b8b3f9cfd208d8e7a0f7680 100644 --- a/app/Models/Quicktips/Quicktips.php +++ b/app/Models/Quicktips/Quicktips.php @@ -46,7 +46,7 @@ class Quicktips $mission = json_encode($mission); - Redis::connection('cache')->rpush(\App\MetaGer::FETCHQUEUE_KEY, $mission); + Redis::rpush(\App\MetaGer::FETCHQUEUE_KEY, $mission); } } diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php index 5b131e377af4feca4dabdd8df84fcf901f527d14..ef364a50c2ae6794752508c67afbcf2c12c31418 100644 --- a/app/Models/Searchengine.php +++ b/app/Models/Searchengine.php @@ -3,7 +3,6 @@ namespace App\Models; use App\MetaGer; -use Cache; use Illuminate\Support\Facades\Redis; abstract class Searchengine @@ -148,7 +147,7 @@ abstract class Searchengine // Submit this mission to the corresponding Redis Queue // Since each Searcher is dedicated to one specific search engine // each Searcher has it's own queue lying under the redis key <name>.queue - Redis::connection('cache')->rpush(\App\MetaGer::FETCHQUEUE_KEY, $mission); + Redis::rpush(\App\MetaGer::FETCHQUEUE_KEY, $mission); if (!empty($timings)) { $timings["startSearch"][$this->name]["pushed job"] = microtime(true) - $timings["starttime"]; } @@ -194,7 +193,7 @@ abstract class Searchengine $body = ""; } } else { - $body = Cache::get($this->hash); + $body = Redis::get($this->hash); } if ($body !== null) { diff --git a/routes/web.php b/routes/web.php index 2fa9efec45f52045b7cbe46a0846bd6e776e8ca6..16b658253b881a5d38385eea7c4137c440d95e78 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,9 +21,7 @@ Route::group( /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/ Route::get('/', 'StartpageController@loadStartPage'); - Route::get('sand', function () { - abort(500, "test"); - }); + Route::get('asso', function () { return view('assoziator.asso') ->with('title', trans('titles.asso'))