From patchwork Thu Aug 10 13:53:31 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1/2] fff-web: Suppress error if WAN/mesh statistics files are missing
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 422
Message-Id: <1502373212-2487-1-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Thu, 10 Aug 2017 15:53:31 +0200

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers   | 11 ++++++-----
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers
index 528fcd4..5e0196c 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers
@@ -3,15 +3,16 @@
 <%
 human_bytes() {
 	while read B ; do
-		[ $B -lt 1024 ] && echo ${B} B && break
+		[ $B -lt 1024 ] && echo ${B} B && return
 		KB=$(((B+512)/1024))
-		[ $KB -lt 1024 ] && echo ${KB} KB && break
+		[ $KB -lt 1024 ] && echo ${KB} KB && return
 		MB=$(((KB+512)/1024))
-		[ $MB -lt 1024 ] && echo ${MB} MB && break
+		[ $MB -lt 1024 ] && echo ${MB} MB && return
 		GB=$(((MB+512)/1024))
-		[ $GB -lt 1024 ] && echo ${GB} GB && break
-		echo $(((GB+512)/1024)) TB
+		[ $GB -lt 1024 ] && echo ${GB} GB && return
+		echo $(((GB+512)/1024)) TB && return
 	done
+	echo "-"
 }
 
 show_msg() {
diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
index 78a83e5..b2529e1 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
@@ -71,8 +71,8 @@ fi
 	<legend>Netz: Freifunk</legend>
 	<table>
 		<tr><th>Nutzer:</th><td><% cat /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c 'W' %></td></tr>
-		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-mesh/statistics/rx_bytes | human_bytes %></td></tr>
-		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-mesh/statistics/tx_bytes | human_bytes %></td></tr>
+		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
+		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
 		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh %></td></tr>
 		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh %></td></tr>
 	</table>
@@ -82,8 +82,8 @@ fi
 	<legend>Netz: WAN</legend>
 	<table>
 		<tr><th>Internet vorhanden:</th><td><%= ${internet_active} %></td></tr>
-		<tr><th>Empfangen:</th><td><% cat /sys/class/net/${wanif}/statistics/rx_bytes | human_bytes %></td></tr>
-		<tr><th>Gesendet:</th><td><% cat /sys/class/net/${wanif}/statistics/tx_bytes | human_bytes %></td></tr>
+		<tr><th>Empfangen:</th><td><% cat /sys/class/net/${wanif}/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
+		<tr><th>Gesendet:</th><td><% cat /sys/class/net/${wanif}/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
 		<tr><th>IPv4 Adressen:</th><td><% addr 4 $wanif %></td></tr>
 		<tr><th>IPv6 Adressen:</th><td><% addr 6 $wanif %></td></tr>
 	</table>