diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-07-19 00:24:58 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-07-19 00:24:58 +0000 |
| commit | 8fcd841aa9af96c8a4a4d3c1a555d2d1ed42332c (patch) | |
| tree | cf6466b373236442e63742cb4f73b22579940784 /applications/luci-statistics/luasrc/statistics | |
| parent | 6abba6163290b58cd9ebae98d8459ac38ef52a4b (diff) | |
convert luci.fs users to nixio.fs api
Diffstat (limited to 'applications/luci-statistics/luasrc/statistics')
| -rw-r--r-- | applications/luci-statistics/luasrc/statistics/rrdtool.lua | 9 | ||||
| -rw-r--r-- | applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-statistics/luasrc/statistics/rrdtool.lua index 911b38bff1..eb5c266b0e 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool.lua @@ -22,7 +22,8 @@ require("luci.statistics.i18n") require("luci.model.uci") require("luci.util") require("luci.sys") -require("luci.fs") + +local fs = require "nixio.fs" Graph = luci.util.class() @@ -96,7 +97,7 @@ function Graph._rrdtool( self, def, rrd ) -- prepare directory local dir = def[1]:gsub("/[^/]+$","") - luci.fs.mkdir( dir, true ) + fs.mkdirr( dir ) -- construct commandline local cmdline = "rrdtool graph" @@ -500,7 +501,7 @@ function Graph.render( self, plugin, plugin_instance ) -- check for a whole graph handler local plugin_def = "luci.statistics.rrdtool.definitions." .. plugin - local stat, def = luci.util.copcall( require, plugin_def ) + local stat, def = pcall( require, plugin_def ) if stat and def and type(def.rrdargs) == "function" then @@ -539,7 +540,7 @@ function Graph.render( self, plugin, plugin_instance ) -- check for data type handler local dtype_def = plugin_def .. "." .. dtype - local stat, def = luci.util.copcall( require, dtype_def ) + local stat, def = pcall( require, dtype_def ) if stat and def and type(def.rrdargs) == "function" then diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua index 7e0b605340..8832613513 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua @@ -16,7 +16,6 @@ $Id$ module("luci.statistics.rrdtool.definitions", package.seeall) require("luci.util") -require("luci.fs") Instance = luci.util.class() |