From 4d44ce6743c9dfa8ac31ddc082cf5d0e8501ab23 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 26 Apr 2012 06:41:11 +0100 Subject: mod_http: Switch to single option for specifying HTTP app bases, http_paths. Keys are app/module names, values are base paths. --- plugins/mod_http.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugins/mod_http.lua') diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 2ba69cb5..8b8d9c47 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -29,6 +29,12 @@ local function get_http_event(host, app_path, key) return method:upper().." "..host..app_path..path; end +local function get_base_path(host_module, app_name, default_app_path) + return host_module:get_option("http_paths", {})[app_name] -- Host + or module:get_option("http_paths", {})[app_name] -- Global + or default_app_path; -- Default +end + function module.add_host(module) local host = module.host; local apps = {}; @@ -36,7 +42,7 @@ function module.add_host(module) local function http_app_added(event) local app_name = event.item.name; local default_app_path = event.item.default_path or "/"..app_name; - local app_path = normalize_path(module:get_option_string(app_name.."_http_path", default_app_path)); + local app_path = normalize_path(get_base_path(module, app_name, default_app_path)); if not app_name then -- TODO: Link to docs module:log("error", "HTTP app has no 'name', add one or use module:provides('http', app)"); -- cgit v1.2.3