From 21ec99d7277bf1a4aef9f1412ac4b9888cc238a4 Mon Sep 17 00:00:00 2001
From: Davide Aprea <davide@suma-ev.de>
Date: Wed, 2 Dec 2020 13:29:12 +0100
Subject: [PATCH] minor fixes
---
app/Http/Controllers/MetaGerSearch.php | 30 ++++++++++++--------------
app/Http/Controllers/Stresstest.php | 8 ++-----
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index 4f0705026..032d739bd 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -12,7 +12,7 @@ use View;
class MetaGerSearch extends Controller
{
- public function search(Request $request, MetaGer $metager, $timing = false, $nocache = false)
+ public function search(Request $request, MetaGer $metager, $timing = false)
{
if ($request->filled("chrome-plugin")) {
return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin"));
@@ -123,21 +123,19 @@ class MetaGerSearch extends Controller
$engine->markNew();
}
}
- if($nocache){
- try {
- Cache::put("loader_" . $metager->getSearchUid(), [
- "metager" => [
- "apiAuthorized" => $metager->isApiAuthorized(),
- ],
- "adgoal" => [
- "loaded" => $metager->isAdgoalLoaded(),
- "adgoalHash" => $metager->getAdgoalHash(),
- ],
- "engines" => $metager->getEngines(),
- ], 60 * 60);
- } catch (\Exception $e) {
- Log::error($e->getMessage());
- }
+ try {
+ Cache::put("loader_" . $metager->getSearchUid(), [
+ "metager" => [
+ "apiAuthorized" => $metager->isApiAuthorized(),
+ ],
+ "adgoal" => [
+ "loaded" => $metager->isAdgoalLoaded(),
+ "adgoalHash" => $metager->getAdgoalHash(),
+ ],
+ "engines" => $metager->getEngines(),
+ ], 60 * 60);
+ } catch (\Exception $e) {
+ Log::error($e->getMessage());
}
if (!empty($timings)) {
$timings["Filled resultloader Cache"] = microtime(true) - $time;
diff --git a/app/Http/Controllers/Stresstest.php b/app/Http/Controllers/Stresstest.php
index cf432279c..4d0977843 100644
--- a/app/Http/Controllers/Stresstest.php
+++ b/app/Http/Controllers/Stresstest.php
@@ -17,17 +17,13 @@ class Stresstest extends MetaGerSearch
return redirect("admin/stress/search?eingabe=test");
}
- public function search(Request $request, MetaGer $metager, $timing = false, $nocache = false)
+ public function search(Request $request, MetaGer $metager, $timing = false)
{
if(empty($request->input('eingabe'))) {
return redirect("admin/stress/search?eingabe=test");
}
$metager->setDummy(true);
$metager->setAdgoalHash(true);
- if(!empty($request->input('cache')) && $request->input('cache') === 'off') {
- parent::search($request, $metager, $timing, true);
- } else {
- parent::search($request, $metager, $timing);
- }
+ parent::search($request, $metager, $timing);
}
}
\ No newline at end of file
--
GitLab