diff options
author | Ted Trask <ttrask01@yahoo.com> | 2013-10-27 01:59:54 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2013-10-27 01:59:54 +0000 |
commit | 89f1e294752c899ebdba06a6fbcfbcc390ecc807 (patch) | |
tree | 9fe02b61b8aef8d4d088762d1aae73179c5305fb /config | |
parent | 148d568b3db38ada9cf0c5085d2c71584d588598 (diff) | |
download | acf-provisioning-89f1e294752c899ebdba06a6fbcfbcc390ecc807.tar.bz2 acf-provisioning-89f1e294752c899ebdba06a6fbcfbcc390ecc807.tar.xz |
Pass logevent function to scripts
Diffstat (limited to 'config')
-rw-r--r-- | config/delete_device.lua | 6 | ||||
-rw-r--r-- | config/determine_class.lua | 4 | ||||
-rw-r--r-- | config/process_put.lua | 4 | ||||
-rw-r--r-- | config/update_device.lua | 2 | ||||
-rw-r--r-- | config/update_device_params.lua | 14 |
5 files changed, 15 insertions, 15 deletions
diff --git a/config/delete_device.lua b/config/delete_device.lua index e009e74..edf9cf2 100644 --- a/config/delete_device.lua +++ b/config/delete_device.lua @@ -5,16 +5,16 @@ posix = require("posix") local root = "/var/www/provisioning/htdocs/" ---APP.logevent("got to delete_device script") +--functions.logevent("got to delete_device script") -- First, we delete the associated config files for Polycom with valid MAC (not blank or all 0's) if oldparams.value.device and string.match(oldparams.value.device.label, "Polycom") and oldparams.value.device.value.mac and string.match(oldparams.value.device.value.mac.value, "[1-9A-F]") then - --APP.logevent("Deleting files for "..oldparams.value.device.value.mac.value) + --functions.logevent("Deleting files for "..oldparams.value.device.value.mac.value) local path = root.."Polycom/" if posix.stat(path, "type") == "directory" then for d in posix.files(path) do if string.match(d, string.lower(oldparams.value.device.value.mac.value)) and posix.stat(path..d, "type") == "regular" then - --APP.logevent("deleting "..path..d) + --functions.logevent("deleting "..path..d) os.remove(path..d) end end diff --git a/config/determine_class.lua b/config/determine_class.lua index 675e6e8..80830fa 100644 --- a/config/determine_class.lua +++ b/config/determine_class.lua @@ -1,7 +1,7 @@ -- This is the script run to determine the device class from the HTTP user agent local functions, agent, classes = ... ---APP.logevent("got to determine_class script") +--functions.logevent("got to determine_class script") local manufacture, model @@ -16,7 +16,7 @@ elseif string.match(agent, "snom") then model = string.match(agent, "snom(%d+)") end ---APP.logevent("Found "..(manufacture or "").." model "..(model or "")) +--functions.logevent("Found "..(manufacture or "").." model "..(model or "")) if manufacture and model then for i,c in ipairs(classes.value) do diff --git a/config/process_put.lua b/config/process_put.lua index 4eabb1a..8497746 100644 --- a/config/process_put.lua +++ b/config/process_put.lua @@ -1,7 +1,7 @@ -- This is the script run to process uploaded config files local functions, mac, data, device_id = ... ---APP.logevent("got to process_put script") +--functions.logevent("got to process_put script") -- Get the params local params = functions.get_device_params(device_id) @@ -18,7 +18,7 @@ function process_polycom() end -- for n,v in pairs(attrs) do --- APP.logevent("name "..n.." val "..(v or "")) +-- functions.logevent("name "..n.." val "..(v or "")) -- end -- Read attributes from attrs and generate paramaters for ACF diff --git a/config/update_device.lua b/config/update_device.lua index 7295062..302b3a7 100644 --- a/config/update_device.lua +++ b/config/update_device.lua @@ -1,7 +1,7 @@ -- This is the script run after editing a device - the label, classes local functions, device, olddevice, params, oldparams = ... ---APP.logevent("got to update_device script") +--functions.logevent("got to update_device script") -- We'll handle the changing of the device by handling the resulting changing of the params local env = {} diff --git a/config/update_device_params.lua b/config/update_device_params.lua index c5ec144..ee7034a 100644 --- a/config/update_device_params.lua +++ b/config/update_device_params.lua @@ -5,7 +5,7 @@ posix = require("posix") local root = "/var/www/provisioning/htdocs/" ---APP.logevent("got to update_device_params script") +--functions.logevent("got to update_device_params script") local function findip(mac) if not mac or mac == "" then @@ -20,10 +20,10 @@ end local notify_device = function(mac, extension) local ipaddr = findip(mac) if ipaddr then - --APP.logevent("Notifying "..ipaddr.." to update for "..(mac or "")) + --functions.logevent("Notifying "..ipaddr.." to update for "..(mac or "")) os.execute("/etc/provisioning/notify_device "..ipaddr.." "..extension) else - --APP.logevent("Warning - could not find IP address for "..(mac or "")) + --functions.logevent("Warning - could not find IP address for "..(mac or "")) end end @@ -34,10 +34,10 @@ if oldparams.value.device and oldparams.value.device.value.mac and oldparams.val if string.match(oldparams.value.device.label, "Polycom") and string.match(oldparams.value.device.value.mac.value, "[1-9A-F]") then local deletefiles = true if string.match(params.value.device.value.mac.value, "[1-9A-F]") then - --APP.logevent("Moving files for "..oldparams.value.device.value.mac.value) + --functions.logevent("Moving files for "..oldparams.value.device.value.mac.value) deletefiles = false else - --APP.logevent("Deleting files for "..oldparams.value.device.value.mac.value) + --functions.logevent("Deleting files for "..oldparams.value.device.value.mac.value) end local path = root.."Polycom/" if posix.stat(path, "type") == "directory" then @@ -45,10 +45,10 @@ if oldparams.value.device and oldparams.value.device.value.mac and oldparams.val if string.match(d, string.lower(oldparams.value.device.value.mac.value)) and posix.stat(path..d, "type") == "regular" then local newfile = string.gsub(d, string.lower(oldparams.value.device.value.mac.value), string.lower(params.value.device.value.mac.value)) if deletefiles then - --APP.logevent("deleting "..path..d) + --functions.logevent("deleting "..path..d) os.remove(path..d) else - --APP.logevent("moving "..path..d.." to "..path..newfile) + --functions.logevent("moving "..path..d.." to "..path..newfile) os.rename(path..d, path..newfile) end end |