From 83a523133906dc6e27e5685c79ce337c7ac36be5 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Fri, 15 Jul 2016 10:59:24 +0200
Subject: [PATCH] Logs erst einmal korrigiert. Eine weitere Anpassung ist
notwendig, sobald klar ist welches Format die Alten Logs haben werden.
---
app/Http/Controllers/AdminInterface.php | 32 +++++++++++++++++--------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/app/Http/Controllers/AdminInterface.php b/app/Http/Controllers/AdminInterface.php
index d68fdc4c7..32eb87b49 100644
--- a/app/Http/Controllers/AdminInterface.php
+++ b/app/Http/Controllers/AdminInterface.php
@@ -45,7 +45,7 @@ class AdminInterface extends Controller
public function count()
{
- $logToday = date("Y-m-d", mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) . "_mg3.log";
+ $logToday = "mg3.log";
if(file_exists("/var/log/metager/".$logToday))
{
$logToday = file("/var/log/metager/".$logToday);
@@ -81,8 +81,11 @@ class AdminInterface extends Controller
$count = 0;
for($i = 1; $i <= 7; $i++)
{
- $count += $oldLogs[$i]['insgesamt'];
- $size++;
+ if( isset($oldLogs[$i]) )
+ {
+ $count += $oldLogs[$i]['insgesamt'];
+ $size++;
+ }
}
$median[7] = ($count/$size);
@@ -91,8 +94,11 @@ class AdminInterface extends Controller
$count = 0;
for($i = 1; $i <= 14; $i++)
{
- $count += $oldLogs[$i]['insgesamt'];
- $size++;
+ if( isset($oldLogs[$i]) )
+ {
+ $count += $oldLogs[$i]['insgesamt'];
+ $size++;
+ }
}
$median[14] = ($count/$size);
@@ -101,8 +107,11 @@ class AdminInterface extends Controller
$count = 0;
for($i = 1; $i <= 21; $i++)
{
- $count += $oldLogs[$i]['insgesamt'];
- $size++;
+ if( isset($oldLogs[$i]) )
+ {
+ $count += $oldLogs[$i]['insgesamt'];
+ $size++;
+ }
}
$median[21] = ($count/$size);
@@ -111,8 +120,11 @@ class AdminInterface extends Controller
$count = 0;
for($i = 1; $i <= 28; $i++)
{
- $count += $oldLogs[$i]['insgesamt'];
- $size++;
+ if( isset($oldLogs[$i]) )
+ {
+ $count += $oldLogs[$i]['insgesamt'];
+ $size++;
+ }
}
$median[28] = ($count/$size);
return view('admin.count')
@@ -127,7 +139,7 @@ class AdminInterface extends Controller
public function check ()
{
$q = "";
- $logFile = "/var/log/metager/" . date("Y-m-d", mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) . "_mg3.log";
+ $logFile = "/var/log/metager/mg3.log";
if( file_exists($logFile) )
{
$q = exec("tail -n 1 $logFile");
--
GitLab