luci-statistics: fix uhttpd log spam from extra png close
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 2 Mar 2015 17:04:16 +0000 (19:04 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Mon, 2 Mar 2015 17:04:16 +0000 (19:04 +0200)
Fix log spam that uhttpd logging change has brought to surface.

Sun Mar  1 11:10:42 2015 daemon.err uhttpd[2293]: /usr/lib/lua/luci/dispatcher.lua:433: Failed to execute call dispatcher target for entry '/admin/statistics/graph/conntrack'.
Sun Mar  1 11:10:42 2015 daemon.err uhttpd[2293]: The called action terminated with an exception:
Sun Mar  1 11:10:42 2015 daemon.err uhttpd[2293]: .../luci/controller/luci_statistics/luci_statistics.lua:153: attempt to use a closed file

Closing the png file explicitly on line 153 is unnecessary, as
ltn12's source.file method already closes the file after use.
https://github.com/openwrt/luci/blob/master/modules/luci-base/luasrc/ltn12.lua#L119

More info at https://dev.openwrt.org/ticket/19083#comment:2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua

index 329341ddc4fe6d9cea0628b73d34974ed848ed18..c532b4a6d301631375aafac45f9fd08f18108556 100644 (file)
@@ -150,7 +150,6 @@ function statistics_render()
                if png then
                        luci.http.prepare_content("image/png")
                        l12.pump.all(l12.source.file(png), luci.http.write)
-                       png:close()
                end
                return
        end