From f5f0c31276f14b3d0e2afee5eaeb8c339d3daa16 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 18 Dec 2023 11:29:44 +0100 Subject: [PATCH] Dashboard: fix stream counters --- emhttp/plugins/dynamix/DashStats.page | 2 +- emhttp/plugins/dynamix/nchan/update_1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page index 9429d0a99..794953a5d 100644 --- a/emhttp/plugins/dynamix/DashStats.page +++ b/emhttp/plugins/dynamix/DashStats.page @@ -454,7 +454,7 @@ if (_var($var,'shareSMBEnabled')=='yes') { $comment = $share['comment'] ?: ' '; $security = export_settings(_var($var,'shareSMBEnabled'), $sec[$name]); $last = $name==array_key_last($shares) ? ' last' : ''; - echo "$list$comment$security0"; + echo "$list$comment$security0"; } if (!count($shares)) echo ""._("No shares present").""; } diff --git a/emhttp/plugins/dynamix/nchan/update_1 b/emhttp/plugins/dynamix/nchan/update_1 index 443af0804..997707221 100755 --- a/emhttp/plugins/dynamix/nchan/update_1 +++ b/emhttp/plugins/dynamix/nchan/update_1 @@ -92,7 +92,7 @@ while (true) { // add fans information if (count($fans)) $echo['fan'] = array_map(function($fan){return "$fan RPM";},$fans); // add streams information - exec("LANG='en_US.UTF8' lsof -Owl /mnt/disk[0-9]* 2>/dev/null|awk -F/ '/^shfs/{print \$4}'",$lsof); + exec("LANG='en_US.UTF8' lsof -Fn /mnt/disk[0-9]* 2>/dev/null|awk -F/ '(NR>1){print \$4}'",$lsof); $share = array_keys(parse_ini_file("$varroot/shares.ini",true)); $count = array_count_values($lsof); foreach ($share as $name) $echo['stream'][] = $count[$name]??0;