jaro/salt-minv-graph
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Loggin fixed

Browse Source
This commit is contained in:
Jaroslav Drzik
2019-11-15 14:55:01 +01:00
parent e2f7d8b5c6
commit ffb9742efb
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Logging.php
View File

@@ -19,7 +19,9 @@ class Logging extends Controller
function conv_bytes($v) { function conv_bytes($v) {
$units = explode(' ', ' K M G T P E Z Y'); $units = explode(' ', ' K M G T P E Z Y');
preg_match('/([0-9]+)([GKMTgkmT])?B/',$v,$vu); preg_match('/([0-9]+)([GKMTgkmT])?B/',$v,$vu);
$v1 = $vu[1]; $v1 = $vu[1];
if (count($vu) == 3) if (count($vu) == 3)
$v2 = $vu[2]; $v2 = $vu[2];
@@ -39,7 +41,7 @@ class Logging extends Controller
public function parse($vals) { public function parse($vals) {
foreach ($vals as $k => $v) foreach ($vals as $k => $v)
{ {
if (is_array($k)) { if (is_array($v)) {
foreach ($v as $k2 => $v2) { foreach ($v as $k2 => $v2) {
$this->_values["$k"."_"."$k2"] = $v2; $this->_values["$k"."_"."$k2"] = $v2;
} }
@@ -48,16 +50,16 @@ class Logging extends Controller
} }
} }
foreach ($this->_items as $k => $v) { foreach ($this->_items as $k => $t) {
$t = $this->_items[$k]; $val = $this->_values[$k];
if ($t == 's') continue; if ($t == 's') continue;
if ($t == 'B') $v = $this->conv_bytes($v); if ($t == 'B') $val = intval($this->conv_bytes($val));
if ($t == 'f') $v = floatval($v); if ($t == 'f') $val = floatval($val);
if ($t == 'i') $v = intval($v); if ($t == 'i') $val = intval($val);
$this->_values[$k] = $v; $this->_values[$k] = $val;
} }
} }
@@ -65,10 +67,10 @@ class Logging extends Controller
$data = json_decode($request->getContent(), true); $data = json_decode($request->getContent(), true);
$v = $data["values"]; $v = $data["values"];
$i = $data["items"]; $i = $data["items"];
var_export($v);
// $this->parse($v);
// var_dump($this->_values); $this->parse($v);
var_export($this->_values);
return "OK"; return "OK";
//DB::insert('insert into values (user,computer,recv,send) values (?, ?, ?, ?)', [$u, $c, $r, $s]); //DB::insert('insert into values (user,computer,recv,send) values (?, ?, ?, ?)', [$u, $c, $r, $s]);