diff options
| -rw-r--r-- | core/modulemanager.lua | 9 | ||||
| -rw-r--r-- | plugins/mod_http.lua | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index b0d54caa..4ba2c27e 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -111,7 +111,7 @@ local function do_unload_module(host, name) return true; end -local function do_load_module(host, module_name) +local function do_load_module(host, module_name, state) if not (host and module_name) then return nil, "insufficient-parameters"; elseif not hosts[host] and host ~= "*"then @@ -152,7 +152,8 @@ local function do_load_module(host, module_name) local _log = logger.init(host..":"..module_name); local api_instance = setmetatable({ name = module_name, host = host, - _log = _log, log = function (self, ...) return _log(...); end, event_handlers = new_multitable() } + _log = _log, log = function (self, ...) return _log(...); end, event_handlers = new_multitable(), + reloading = not not state, saved_state = state~=true and state or nil } , { __index = api }); local pluginenv = setmetatable({ module = api_instance }, { __index = _G }); @@ -176,6 +177,7 @@ local function do_load_module(host, module_name) log("warn", "Error loading module '%s' on '%s': %s", module_name, host, err or "nil"); end end + api_instance.reloading, api_instance.saved_state = nil, nil; if api_instance.host == "*" then if not api_instance.global then -- COMPAT w/pre-0.9 @@ -225,8 +227,9 @@ local function do_reload_module(host, name) end end + mod.module.reloading = true; do_unload_module(host, name); - local ok, err = do_load_module(host, name); + local ok, err = do_load_module(host, name, saved or true); if ok then mod = get_module(host, name); if module_has_method(mod, "restore") then diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 4f09716c..f386f870 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -55,7 +55,7 @@ function moduleapi.http_url(module, app_name, default_path) for port, services in pairs(ports) do local url = { scheme = (external_url.scheme or services[1].service.name); - host = (external_url.host or module.host); + host = (external_url.host or module:get_option_string("http_host", module.host)); port = tonumber(external_url.port) or port or 80; path = normalize_path(external_url.path or "/").. (get_base_path(module, app_name, default_path or "/"..app_name):sub(2)); |