From 4d494be7ac60d4317b2b260602cf375d65f181d8 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 27 Feb 2019 08:39:27 +0100
Subject: [PATCH] Fixed an error for the english version
---
app/Providers/AppServiceProvider.php | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 719790e42..846a5c6d0 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,9 +4,9 @@ namespace App\Providers;
use Illuminate\Queue\Events\JobProcessed;
use Illuminate\Queue\Events\JobProcessing;
+use Illuminate\Support\Facades\Redis;
use Illuminate\Support\ServiceProvider;
use Queue;
-use Illuminate\Support\Facades\Redis;
use Request;
class AppServiceProvider extends ServiceProvider
@@ -24,10 +24,13 @@ class AppServiceProvider extends ServiceProvider
* We will change the Locale to en
*/
$host = Request::header("X_Forwarded_Host", "");
+ if (empty($host)) {
+ $host = Request::header("Host", "");
+ }
- if(stripos($host, "metager.org") !== FALSE){
- App::setLocale('en');
- }
+ if (stripos($host, "metager.org") !== false) {
+ \App::setLocale('en');
+ }
# Wir loggen im Redis-System für jede Sekunde des Tages, wie viele Worker aktiv am Laufen waren.
# Dies ist notwendig, damit wir mitbekommen können, ab welchem Zeitpunkt wir zu wenig Worker zur Verfügung haben.
@@ -35,8 +38,8 @@ class AppServiceProvider extends ServiceProvider
$this->begin = strtotime(date(DATE_RFC822, mktime(date("H"), date("i"), date("s"), date("m"), date("d"), date("Y"))));
});
Queue::after(function (JobProcessed $event) {
- $today = strtotime(date(DATE_RFC822, mktime(0, 0, 0, date("m"), date("d"), date("Y"))));
- $end = strtotime(date(DATE_RFC822, mktime(date("H"), date("i"), date("s"), date("m"), date("d"), date("Y")))) - $today;
+ $today = strtotime(date(DATE_RFC822, mktime(0, 0, 0, date("m"), date("d"), date("Y"))));
+ $end = strtotime(date(DATE_RFC822, mktime(date("H"), date("i"), date("s"), date("m"), date("d"), date("Y")))) - $today;
$expireAt = strtotime(date(DATE_RFC822, mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))));
try {
$redis = Redis::connection('redisLogs');
@@ -44,8 +47,8 @@ class AppServiceProvider extends ServiceProvider
return;
}
- $p = getmypid();
- $host = gethostname();
+ $p = getmypid();
+ $host = gethostname();
$begin = $this->begin - $today;
$redis->pipeline(function ($pipe) use ($p, $expireAt, $host, $begin, $end) {
for ($i = $begin; $i <= $end; $i++) {
--
GitLab