wbk/my-idlers
1
0
Fork 0
mirror of https://github.com/cp6/my-idlers.git synced 2025-10-30 22:09:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cad54a32d4 into 525b1d29f0

Browse source
This commit is contained in:
Ahmad Shamli 2024-12-29 13:56:21 +01:00 • committed by GitHub
commit c6fc8e8d39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 79 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/Models/Yabs.php
View file

@ -188,6 +188,7 @@ class Yabs extends Model
$disk = $data['mem']['disk']; $disk = $data['mem']['disk'];
$gb5_single = $gb5_multi = $gb5_id = $gb6_single = $gb6_multi = $gb6_id = null; $gb5_single = $gb5_multi = $gb5_id = $gb6_single = $gb6_multi = $gb6_id = null;
if ($data['geekbench']) {
foreach ($data['geekbench'] as $gb) { foreach ($data['geekbench'] as $gb) {
if ($gb['version'] === 5) { if ($gb['version'] === 5) {
$gb5_single = $gb['single']; $gb5_single = $gb['single'];
@ -199,6 +200,7 @@ class Yabs extends Model
$gb6_id = self::gb6IdFromURL($gb['url']); $gb6_id = self::gb6IdFromURL($gb['url']);
} }
} }
}
$yabs_id = Str::random(8); $yabs_id = Str::random(8);
@ -249,6 +251,7 @@ class Yabs extends Model
]); ]);
//fio //fio
if ($data['fio']) {
foreach ($data['fio'] as $ds) { foreach ($data['fio'] as $ds) {
if ($ds['bs'] === '4k') { if ($ds['bs'] === '4k') {
$d4k = ($ds['speed_rw'] > 999999) ? ($ds['speed_rw'] / 1000 / 1000) : $ds['speed_rw'] / 1000; $d4k = ($ds['speed_rw'] > 999999) ? ($ds['speed_rw'] / 1000 / 1000) : $ds['speed_rw'] / 1000;
@ -272,24 +275,27 @@ class Yabs extends Model
} }
} }
}
DiskSpeed::create([ DiskSpeed::create([
'id' => $yabs_id, 'id' => $yabs_id,
'server_id' => $server_id, 'server_id' => $server_id,
'd_4k' => $d4k, 'd_4k' => isset($d4k) ? $d4k : 0.0,
'd_4k_type' => $d4k_type, 'd_4k_type' => isset($d4k_type) ? $d4k_type : 'MB/s',
'd_4k_as_mbps' => $d4k_mbps, 'd_4k_as_mbps' => isset($d4k_mbps) ? $d4k_mbps : 0.0,
'd_64k' => $d64k, 'd_64k' => isset($d64k) ? $d64k : 0.0,
'd_64k_type' => $d64k_type, 'd_64k_type' => isset($d64k_type) ? $d64k_type : 'MB/s',
'd_64k_as_mbps' => $d64k_mbps, 'd_64k_as_mbps' => isset($d64k_mbps) ? $d64k_mbps : 0.0,
'd_512k' => $d512k, 'd_512k' => isset($d512k) ? $d512k : 0.0,
'd_512k_type' => $d512k_type, 'd_512k_type' => isset($d512k_type) ? $d512k_type : 'MB/s',
'd_512k_as_mbps' => $d512k_mbps, 'd_512k_as_mbps' => isset($d512k_mbps) ? $d512k_mbps : 0.0,
'd_1m' => $d1m, 'd_1m' => isset($d1m) ? $d1m : 0.0,
'd_1m_type' => $d1m_type, 'd_1m_type' => isset($d1m_type) ? $d1m_type : 'MB/s',
'd_1m_as_mbps' => $d1m_mbps 'd_1m_as_mbps' => isset($d1m_mbps) ? $d1m_mbps : 0.0,
]); ]);
//iperf //iperf
if ($data['iperf']) {
foreach ($data['iperf'] as $st) { foreach ($data['iperf'] as $st) {
($has_ipv4) ? $match = 'IPv4' : $match = 'IPv6'; ($has_ipv4) ? $match = 'IPv4' : $match = 'IPv6';
if ($st['mode'] === $match) { if ($st['mode'] === $match) {
@ -308,6 +314,20 @@ class Yabs extends Model
} }
} }
} }
} else {
NetworkSpeed::create([
'id' => $yabs_id,
'server_id' => $server_id,
'location' => 'None',
'send' => 0.0,
'send_type' => 'MB/s',
'send_as_mbps' => 0.0,
'receive' => 0.0,
'receive_type' => 'MB/s',
'receive_as_mbps' => 0.0
]);
}
//Update server //Update server
$update_server = DB::table('servers') $update_server = DB::table('servers')