From bf907eafda47648257d4b4a39eeaf21b9eddec0c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 25 May 2008 17:53:04 +0000 Subject: [PATCH] * luci/statistics: ffluci -> luci conversation --- .../luci_statistics/luci_statistics.lua | 12 ++++----- .../model/cbi/luci_statistics/collectd.lua | 4 +-- .../src/model/cbi/luci_statistics/dns.lua | 4 +-- .../model/cbi/luci_statistics/interface.lua | 4 +-- .../model/cbi/luci_statistics/iptables.lua | 4 +-- .../src/model/cbi/luci_statistics/netlink.lua | 12 ++++----- .../src/statistics/datatree.lua | 10 +++---- .../src/statistics/rrdtool.lua | 26 +++++++++---------- .../src/statistics/rrdtool/colors.lua | 14 +++++----- .../src/statistics/rrdtool/definitions.lua | 8 +++--- .../rrdtool/definitions/cpu/cpu.lua | 2 +- .../definitions/iptables/ipt_packets.lua | 2 +- .../rrdtool/definitions/netlink.lua | 2 +- .../rrdtool/definitions/ping/ping.lua | 2 +- .../definitions/processes/ps_state.lua | 2 +- .../definitions/tcpconns/tcp_connections.lua | 2 +- .../rrdtool/definitions/wireless.lua | 2 +- .../view/admin_statistics/networkplugins.htm | 4 +-- .../view/admin_statistics/outputplugins.htm | 4 +-- .../view/admin_statistics/systemplugins.htm | 4 +-- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua index a30db7c09..df262a115 100644 --- a/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/src/controller/luci_statistics/luci_statistics.lua @@ -1,9 +1,9 @@ -module("ffluci.controller.luci_statistics.luci_statistics", package.seeall) +module("luci.controller.luci_statistics.luci_statistics", package.seeall) -local fs = require("ffluci.fs") -local tpl = require("ffluci.template") -local rrd = require("ffluci.statistics.rrdtool") -local data = require("ffluci.statistics.datatree").Instance() +local fs = require("luci.fs") +local tpl = require("luci.template") +local rrd = require("luci.statistics.rrdtool") +local data = require("luci.statistics.datatree").Instance() function _entry( path, ... ) @@ -93,7 +93,7 @@ end function statistics_render() - local plugin = ffluci.dispatcher.request[3] + local plugin = luci.dispatcher.request[3] local images = { } for i, inst in ipairs( data:plugin_instances( plugin ) ) do diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua index 21ff457e3..e09a11df1 100644 --- a/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua +++ b/applications/luci-statistics/src/model/cbi/luci_statistics/collectd.lua @@ -13,7 +13,7 @@ $Id$ ]]-- -require("ffluci.sys") +require("luci.sys") m = Map("luci_statistics", "Collector Daemon", @@ -56,7 +56,7 @@ readthreads.isnumber = true -- general.hostname (Hostname) hostname = s:option( Value, "Hostname", "Hostname zur Identifikation des Collector Dienstes (leer lassen um den Namen automatisch zu bestimmen)" ) -hostname.default = ffluci.sys.hostname() +hostname.default = luci.sys.hostname() hostname.optional = true -- general.fqdnlookup (FQDNLookup) diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua index ed71a55a3..dc7f57d68 100644 --- a/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua +++ b/applications/luci-statistics/src/model/cbi/luci_statistics/dns.lua @@ -13,7 +13,7 @@ $Id$ ]]-- -require("ffluci.sys") +require("luci.sys") m = Map("luci_statistics", "DNS Plugin", @@ -30,7 +30,7 @@ enable.default = 0 interfaces = s:option( ListValue, "Interface", "Folgende Schnittstelle überwachen:" ) interfaces:depends( "enable", 1 ) interfaces:value("any") -for k, v in pairs(ffluci.sys.net.devices()) do +for k, v in pairs(luci.sys.net.devices()) do interfaces:value(v) end diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua index 5acd4e93c..3cd71a15d 100644 --- a/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua +++ b/applications/luci-statistics/src/model/cbi/luci_statistics/interface.lua @@ -13,7 +13,7 @@ $Id$ ]]-- -require("ffluci.sys") +require("luci.sys") m = Map("luci_statistics", "Interface Plugin", @@ -30,7 +30,7 @@ enable.default = 0 interfaces = s:option( MultiValue, "Interfaces", "Überwachte Schnittstellen", "mehrere Einträge mit Strg selektieren" ) interfaces.widget = "select" interfaces:depends( "enable", 1 ) -for k, v in pairs(ffluci.sys.net.devices()) do +for k, v in pairs(luci.sys.net.devices()) do interfaces:value(v) end diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua index 475729589..4b6d9dbf4 100644 --- a/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua +++ b/applications/luci-statistics/src/model/cbi/luci_statistics/iptables.lua @@ -13,9 +13,9 @@ $Id$ ]]-- -require("ffluci.sys.iptparser") +require("luci.sys.iptparser") -ip = ffluci.sys.iptparser.IptParser() +ip = luci.sys.iptparser.IptParser() chains = { } targets = { } diff --git a/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua b/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua index 478560f97..a27def8eb 100644 --- a/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua +++ b/applications/luci-statistics/src/model/cbi/luci_statistics/netlink.lua @@ -13,7 +13,7 @@ $Id$ ]]-- -require("ffluci.sys") +require("luci.sys") m = Map("luci_statistics", "Interface Plugin", @@ -32,7 +32,7 @@ interfaces.widget = "select" interfaces.optional = true interfaces:depends( "enable", 1 ) interfaces:value("") -for i, v in ipairs(ffluci.sys.net.devices()) do +for i, v in ipairs(luci.sys.net.devices()) do interfaces:value(v) end @@ -42,7 +42,7 @@ verboseinterfaces.widget = "select" verboseinterfaces.optional = true verboseinterfaces:depends( "enable", 1 ) verboseinterfaces:value("") -for i, v in ipairs(ffluci.sys.net.devices()) do +for i, v in ipairs(luci.sys.net.devices()) do verboseinterfaces:value(v) end @@ -52,7 +52,7 @@ qdiscs.widget = "select" qdiscs.optional = true qdiscs:depends( "enable", 1 ) qdiscs:value("") -for i, v in ipairs(ffluci.sys.net.devices()) do +for i, v in ipairs(luci.sys.net.devices()) do qdiscs:value(v) end @@ -62,7 +62,7 @@ classs.widget = "select" classs.optional = true classs:depends( "enable", 1 ) classs:value("") -for i, v in ipairs(ffluci.sys.net.devices()) do +for i, v in ipairs(luci.sys.net.devices()) do classs:value(v) end @@ -72,7 +72,7 @@ filters.widget = "select" filters.optional = true filters:depends( "enable", 1 ) filters:value("") -for i, v in ipairs(ffluci.sys.net.devices()) do +for i, v in ipairs(luci.sys.net.devices()) do filters:value(v) end diff --git a/applications/luci-statistics/src/statistics/datatree.lua b/applications/luci-statistics/src/statistics/datatree.lua index 99e7e4442..957b230a9 100644 --- a/applications/luci-statistics/src/statistics/datatree.lua +++ b/applications/luci-statistics/src/statistics/datatree.lua @@ -1,9 +1,9 @@ -module("ffluci.statistics.datatree", package.seeall) +module("luci.statistics.datatree", package.seeall) -local util = require("ffluci.util") -local sys = require("ffluci.sys") -local fs = require("ffluci.fs") -local uci = require("ffluci.model.uci").Session() +local util = require("luci.util") +local sys = require("luci.sys") +local fs = require("luci.fs") +local uci = require("luci.model.uci").Session() local sections, names = uci:sections( "luci_statistics" ) diff --git a/applications/luci-statistics/src/statistics/rrdtool.lua b/applications/luci-statistics/src/statistics/rrdtool.lua index 97772cc38..b399866a8 100644 --- a/applications/luci-statistics/src/statistics/rrdtool.lua +++ b/applications/luci-statistics/src/statistics/rrdtool.lua @@ -1,23 +1,23 @@ -module("ffluci.statistics.rrdtool", package.seeall) +module("luci.statistics.rrdtool", package.seeall) -require("ffluci.statistics.datatree") -require("ffluci.statistics.rrdtool.colors") -require("ffluci.statistics.rrdtool.definitions") -require("ffluci.util") -require("ffluci.bits") -require("ffluci.fs") +require("luci.statistics.datatree") +require("luci.statistics.rrdtool.colors") +require("luci.statistics.rrdtool.definitions") +require("luci.util") +require("luci.bits") +require("luci.fs") -Graph = ffluci.util.class() +Graph = luci.util.class() function Graph.__init__( self, timespan, opts ) opts = opts or { } opts.width = opts.width or "400" - self.colors = ffluci.statistics.rrdtool.colors.Instance() - self.defs = ffluci.statistics.rrdtool.definitions.Instance() - self.tree = ffluci.statistics.datatree.Instance() + self.colors = luci.statistics.rrdtool.colors.Instance() + self.defs = luci.statistics.rrdtool.definitions.Instance() + self.tree = luci.statistics.datatree.Instance() -- rrdtool defalt args self.args = { @@ -77,7 +77,7 @@ function Graph._rrdtool( self, png, rrd ) -- prepare directory local dir = png:gsub("/[^/]+$","") - ffluci.fs.mkdir( dir, true ) + luci.fs.mkdir( dir, true ) -- construct commandline local cmdline = "rrdtool graph " .. png @@ -195,7 +195,7 @@ function Graph.render( self, host, plugin, plugin_instance ) local pngs = { } -- check for a whole graph handler - local plugin_def = "ffluci.statistics.rrdtool.definitions." .. plugin + local plugin_def = "luci.statistics.rrdtool.definitions." .. plugin local stat, def = pcall( require, plugin_def ) if stat and def and type(def.rrdargs) == "function" then diff --git a/applications/luci-statistics/src/statistics/rrdtool/colors.lua b/applications/luci-statistics/src/statistics/rrdtool/colors.lua index cd1e52d19..cdd6f7105 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/colors.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/colors.lua @@ -1,16 +1,16 @@ -module("ffluci.statistics.rrdtool.colors", package.seeall) +module("luci.statistics.rrdtool.colors", package.seeall) -require("ffluci.util") -require("ffluci.bits") +require("luci.util") +require("luci.bits") -Instance = ffluci.util.class() +Instance = luci.util.class() function Instance.from_string( self, s ) return { - ffluci.bits.Hex2Dec(s:sub(1,2)), - ffluci.bits.Hex2Dec(s:sub(3,4)), - ffluci.bits.Hex2Dec(s:sub(5,6)) + luci.bits.Hex2Dec(s:sub(1,2)), + luci.bits.Hex2Dec(s:sub(3,4)), + luci.bits.Hex2Dec(s:sub(5,6)) } end diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions.lua index 9d06fa4b6..add69e4b6 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions.lua @@ -1,10 +1,10 @@ -module("ffluci.statistics.rrdtool.definitions", package.seeall) +module("luci.statistics.rrdtool.definitions", package.seeall) -require("ffluci.util") -require("ffluci.fs") +require("luci.util") +require("luci.fs") -Instance = ffluci.util.class() +Instance = luci.util.class() function Instance.__init__( self, ... ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua index 557c5dafe..2626d276d 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.cpu.cpu",package.seeall) +module("luci.statistics.rrdtool.definitions.cpu.cpu",package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua index 1b45e25a9..b16add995 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeall) +module("luci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua index de3924dc7..3cee6abc0 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.netlink", package.seeall) +module("luci.statistics.rrdtool.definitions.netlink", package.seeall) function rrdargs( graph, host, plugin, plugin_instance ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua index 48a5673ad..b041c015d 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.ping.ping", package.seeall) +module("luci.statistics.rrdtool.definitions.ping.ping", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua index 4261e0989..07cbe1d4a 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.processes.ps_state", package.seeall) +module("luci.statistics.rrdtool.definitions.processes.ps_state", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua index 81860d099..049357494 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.seeall) +module("luci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua index 5b3acc51f..e315ca521 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.wireless", package.seeall) +module("luci.statistics.rrdtool.definitions.wireless", package.seeall) function rrdargs( graph, host, plugin, plugin_instance ) diff --git a/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm index 0c6d7f7ad..d3aa87eb1 100644 --- a/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm +++ b/applications/luci-statistics/src/view/admin_statistics/networkplugins.htm @@ -8,8 +8,8 @@ auf verschiedenen Schnittstellen, DNS-Verkehr u.v.m.%>

<%:stat_networkplugins_installed Installierte Netzwerkplugins:%>

diff --git a/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm b/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm index ed8651407..5a8a76045 100644 --- a/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm +++ b/applications/luci-statistics/src/view/admin_statistics/outputplugins.htm @@ -9,8 +9,8 @@ die gesammelten Werte in RRD-Datenbanken zu sichern und zusätzlich über das Ne

<%:stat_outputplugins_installed Installierte Ausgabeplugins:%>

diff --git a/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm b/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm index cbb469a1f..2a32bf5ca 100644 --- a/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm +++ b/applications/luci-statistics/src/view/admin_statistics/systemplugins.htm @@ -8,8 +8,8 @@ auf dem Gerät.%>

<%:stat_systemplugins_installed Installierte Systemplugins:%>

-- 2.25.1