luci-mod-admin-full: status: survive broken DSL status output
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 3 Oct 2015 14:11:11 +0000 (16:11 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 3 Oct 2015 14:11:14 +0000 (16:11 +0200)
Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm

index 07a96b2..a98d790 100644 (file)
@@ -88,7 +88,9 @@
                if has_dsl then
                        local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
                        local dsl_func = loadstring(dsl_stat)
                if has_dsl then
                        local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
                        local dsl_func = loadstring(dsl_stat)
-                       rv.dsl = dsl_func()
+                       if dsl_func then
+                               rv.dsl = dsl_func()
+                       end
                end
 
                luci.http.prepare_content("application/json")
                end
 
                luci.http.prepare_content("application/json")