From: Florian Eckert Date: Mon, 31 Jul 2017 11:57:51 +0000 (+0200) Subject: net/mwan3: expand ubus to show when last mwan3track check was done X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=929bec64021e5e3f07c7ab59b668b43c6dd2f0d8;p=openwrt-packages.git net/mwan3: expand ubus to show when last mwan3track check was done To know how old the ubus output is, add an age parameter which indicats how old the check informations on the interface are. Signed-off-by: Florian Eckert --- diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3 index 1342894b6..6bb6f8dd1 100755 --- a/net/mwan3/files/usr/libexec/rpcd/mwan3 +++ b/net/mwan3/files/usr/libexec/rpcd/mwan3 @@ -34,7 +34,8 @@ get_mwan3_status() { local iface="${1}" local iface_select="${2}" local running="0" - local pid device + local age=0 + local pid device time_p time_n network_get_device device $1 @@ -44,7 +45,14 @@ get_mwan3_status() { running="1" fi + time_p="$(cat "$MWAN3_STATUS_DIR/${iface}/TIME")" + [ -z "${time_p}" ] || { + time_n="$(date +'%s')" + let age=time_n-time_p + } + json_add_object "${iface}" + json_add_int age "$age" json_add_string "score" "$(cat "$MWAN3_STATUS_DIR/${iface}/SCORE")" json_add_string "lost" "$(cat "$MWAN3_STATUS_DIR/${iface}/LOST")" json_add_string "turn" "$(cat "$MWAN3_STATUS_DIR/${iface}/TURN")" diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index f9909dd0e..bdb793b59 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -154,6 +154,7 @@ main() { echo "${lost}" > /var/run/mwan3track/$1/LOST echo "${score}" > /var/run/mwan3track/$1/SCORE echo "${turn}" > /var/run/mwan3track/$1/TURN + echo "$(date +'%s')" > /var/run/mwan3track/$1/TIME host_up_count=0 sleep "${sleep_time}" &