Skip to content
Snippets Groups Projects
Commit 17444e92 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Logs korrigiert

parent eb8c1c04
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/AdminInterface.php
+ 8
− 53
View file @ 17444e92
...@@ -57,9 +57,11 @@ class AdminInterface extends Controller ...@@ -57,9 +57,11 @@ class AdminInterface extends Controller
$yesterday = 0; $yesterday = 0;
$rekordTag = 0; $rekordTag = 0;
$rekordTagDate = ""; $rekordTagDate = "";
$size = 0;
$count = 0;
for($i = 1; $i <= 28; $i ++ ) for($i = 1; $i <= 28; $i ++ )
{ {
$logDate = "/var/log/metager/archive/" . date("Y-m-d", mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$i, date("Y"))) . "_mg3.log"; $logDate = "/var/log/metager/archive/mg3.log.$i";
if( file_exists($logDate) ) if( file_exists($logDate) )
{ {
$sameTime = exec("grep -n '" . date('H') . ":" . date('i') . ":' $logDate | tail -1 | cut -f1 -d':'"); $sameTime = exec("grep -n '" . date('H') . ":" . date('i') . ":' $logDate | tail -1 | cut -f1 -d':'");
...@@ -72,69 +74,22 @@ class AdminInterface extends Controller ...@@ -72,69 +74,22 @@ class AdminInterface extends Controller
} }
$oldLogs[$i]['sameTime'] = $sameTime; $oldLogs[$i]['sameTime'] = $sameTime;
$oldLogs[$i]['insgesamt'] = $insgesamt; $oldLogs[$i]['insgesamt'] = $insgesamt;
} # Nun noch den median:
} $count += $insgesamt;
$median = [];
# Median für 7 Tage:
$size = 0;
$count = 0;
for($i = 1; $i <= 7; $i++)
{
if( isset($oldLogs[$i]) )
{
$count += $oldLogs[$i]['insgesamt'];
$size++; $size++;
if($size > 0)
$oldLogs[$i]['median'] = ($count/$size);
} }
} }
$median[7] = ($count/$size);
# Median für 14 Tage:
$size = 0;
$count = 0;
for($i = 1; $i <= 14; $i++)
{
if( isset($oldLogs[$i]) )
{
$count += $oldLogs[$i]['insgesamt'];
$size++;
}
}
$median[14] = ($count/$size);
# Median für 21 Tage:
$size = 0;
$count = 0;
for($i = 1; $i <= 21; $i++)
{
if( isset($oldLogs[$i]) )
{
$count += $oldLogs[$i]['insgesamt'];
$size++;
}
}
$median[21] = ($count/$size);
# Median für 28 Tage:
$size = 0;
$count = 0;
for($i = 1; $i <= 28; $i++)
{
if( isset($oldLogs[$i]) )
{
$count += $oldLogs[$i]['insgesamt'];
$size++;
}
}
$median[28] = ($count/$size);
return view('admin.count') return view('admin.count')
->with('title', 'Suchanfragen - MetaGer') ->with('title', 'Suchanfragen - MetaGer')
->with('today', number_format(floatval(sizeof($logToday)), 0, ",", ".")) ->with('today', number_format(floatval(sizeof($logToday)), 0, ",", "."))
->with('oldLogs', $oldLogs) ->with('oldLogs', $oldLogs)
->with('rekordCount', number_format(floatval($rekordTag), 0, ",", ".")) ->with('rekordCount', number_format(floatval($rekordTag), 0, ",", "."))
->with('rekordTagSameTime', number_format(floatval($rekordTagSameTime), 0, ",", ".")) ->with('rekordTagSameTime', number_format(floatval($rekordTagSameTime), 0, ",", "."))
->with('rekordDate', $rekordTagDate) ->with('rekordDate', $rekordTagDate);
->with('median', $median);
} }
public function check () public function check ()
{ {
......
resources/views/admin/count.blade.php
+ 27
− 8
View file @ 17444e92
...@@ -4,14 +4,33 @@ ...@@ -4,14 +4,33 @@
@section('content') @section('content')
<h2>{{ exec("uptime") }}</h2> <h2>{{ exec("uptime") }}</h2>
<h3>Heute haben wir bis jetzt => <span class="text-info">{{ $today }}</span> Abfragen</h3> <table class="table table-striped">
<h3>Gestern zur gleichen Zeit <span class="text-info">{{ $oldLogs[1]['sameTime'] }}</span> - insgesamt <span class="text-danger">{{ $oldLogs[1]['insgesamt'] }}</span></h3> <caption>Daten der letzten Tage</caption>
<h3>Vorgestern zur gleichen Zeit <span class="text-info">{{ $oldLogs[2]['sameTime'] }}</span> - insgesamt <span class="text-danger">{{ $oldLogs[2]['insgesamt'] }}</span></h3> <tr>
<h3>Vorvorgestern zur gleichen Zeit <span class="text-info">{{ $oldLogs[3]['sameTime'] }}</span> - insgesamt <span class="text-danger">{{ $oldLogs[3]['insgesamt'] }}</span></h3> <th>Datum</th>
<ul class="list-unstyled" style="text-align:left;"> <th>Suchanfragen zur gleichen Zeit</th>
@foreach($median as $time => $value) <th>Suchanfragen insgesamt</th>
<li><h4>Mittelwert der letzten {{ $time }} Tage: <span class="text-danger">{{ number_format($value, 0, ",", ".") }}</span> Abfragen pro Tag</h4></li> <th>Mittelwert</th>
</tr>
@if( isset($today) )
<tr>
<td>{{ date(DATE_RFC822, mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) }}</td>
<td>{{ $today }}</td>
<td>???</td>
<td>???</td>
</tr>
@endif
@foreach($oldLogs as $key => $value)
<tr>
<td>{{ date(DATE_RFC822, mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) }}</td>
<td>{{ $value['sameTime'] }}</td>
<td>{{ $value['insgesamt'] }}</td>
<td>{{ $value['median'] }}</td>
</tr>
@endforeach @endforeach
</ul> </table>
@if( isset($rekordDate) && isset($rekordTagSameTime) && isset($rekordCount) )
<h3>Rekord am {{ $rekordDate }} zur gleichen Zeit <span class="text-info">{{ $rekordTagSameTime }}</span> - insgesamt <span class="text-danger">{{ $rekordCount }}</span></h3> <h3>Rekord am {{ $rekordDate }} zur gleichen Zeit <span class="text-info">{{ $rekordTagSameTime }}</span> - insgesamt <span class="text-danger">{{ $rekordCount }}</span></h3>
@endif
@endsection @endsection
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment