mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

Merge 7197eb09dc into 238994e1e2

This commit is contained in:
jplitza 2014-01-16 14:49:57 -08:00
parent 238994e1e2 7197eb09dc
commit b2c408b39d
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gluon/gluon-alfred/Makefile
View File

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/gluon-alfred
SECTION:=gluon
CATEGORY:=Gluon
DEPENDS:=+gluon-core +gluon-location +gluon-cron +alfred
DEPENDS:=+gluon-core +gluon-location +gluon-cron +alfred +ethtool
TITLE:=Configure alfred
endef

18
gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh
View File

@ -23,8 +23,10 @@ set -e
# simultaneously, wait for a random time between 0 and 300 seconds, but fixed
# for each device to maintain 5 minutes between updates.
# Calculated using first 3 hex digits of the primary MAC address' MD5 hash
DELAY=$((0x$(sysconfig primary_mac | md5sum | head -c3) * $MAX_WAIT / (16**3)))
sleep $DELAY
if [ "$1" != "--no-sleep" ]; then
DELAY=$((0x$(sysconfig primary_mac | md5sum | head -c3) * $MAX_WAIT / (16**3)))
sleep $DELAY
fi
json_init
json_add_string "hostname" "$(uci get 'system.@system[0].hostname')"
@ -73,8 +75,16 @@ json_close_object # network
json_add_object "statistics"
json_add_int "uptime" "$(cut -d' ' -f1 /proc/uptime)"
json_add_object "traffic"
json_add_double "rx" "$(cat /sys/class/net/bat0/statistics/rx_bytes)"
json_add_double "tx" "$(cat /sys/class/net/bat0/statistics/tx_bytes)"
TRAFFIC="$(ethtool -S bat0 | sed -e 's/^ *//')"
for class in rx tx forward mgmt_rx mgmt_tx; do
json_add_object "$class"
json_add_int "bytes" "$(echo "$TRAFFIC" | awk -F': ' "/^${class}_bytes:/ { print \$2 }")"
json_add_int "packets" "$(echo "$TRAFFIC" | awk -F': ' "/^${class}:/ { print \$2 }")"
if [ "$class" = "tx" ]; then
json_add_int "dropped" "$(echo "$TRAFFIC" | awk -F': ' "/^${class}_dropped:/ { print \$2 }")"
fi
json_close_object # $class
done
json_close_object # traffic
json_close_object # statistics