diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-16 23:49:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-16 23:49:27 +0100 |
| commit | 3601968ff85a10f18f1dba92360aac7efabe09ad (patch) | |
| tree | 5d9e9dfec7020f862dc40a4b872556e3661b5327 /core | |
| parent | 33f73b5b885da18cef1b983cd1a1fe6d287e0391 (diff) | |
| parent | 4ce8edd6eb83eff68970077e9c3c99df19f5a955 (diff) | |
| download | prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.tar.gz prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 62c34031..e39fd026 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -214,7 +214,7 @@ function api:get_option(name, default_value) return value; end -function api:get_option_string(name, default_value) +function api:get_option_scalar(name, default_value) local value = self:get_option(name, default_value); if type(value) == "table" then if #value > 1 then @@ -222,6 +222,11 @@ function api:get_option_string(name, default_value) end value = value[1]; end + return value; +end + +function api:get_option_string(name, default_value) + local value = self:get_option_scalar(name, default_value); if value == nil then return nil; end @@ -229,13 +234,7 @@ function api:get_option_string(name, default_value) end function api:get_option_number(name, ...) - local value = self:get_option(name, ...); - if type(value) == "table" then - if #value > 1 then - self:log("error", "Config option '%s' does not take a list, using just the first item", name); - end - value = value[1]; - end + local value = self:get_option_scalar(name, ...); local ret = tonumber(value); if value ~= nil and ret == nil then self:log("error", "Config option '%s' not understood, expecting a number", name); @@ -244,13 +243,7 @@ function api:get_option_number(name, ...) end function api:get_option_boolean(name, ...) - local value = self:get_option(name, ...); - if type(value) == "table" then - if #value > 1 then - self:log("error", "Config option '%s' does not take a list, using just the first item", name); - end - value = value[1]; - end + local value = self:get_option_scalar(name, ...); if value == nil then return nil; end |