From c2c4f7fbc44b9df2873e62d7f9745ba864388e38 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 21 Mar 2017 12:06:52 +0100 Subject: mod_http_files: Use path variant of config option API for http_files_dir --- plugins/mod_http_files.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index b9a84cd3..e477bafe 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -16,7 +16,7 @@ local stat = lfs.attributes; local build_path = require"socket.url".build_path; local path_sep = package.config:sub(1,1); -local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path")); +local base_path = module:get_option_path("http_files_dir", module:get_option_path("http_path")); local cache_size = module:get_option_number("http_files_cache_size", 128); local cache_max_file_size = module:get_option_number("http_files_cache_max_file_size", 4096); local dir_indices = module:get_option_array("http_index_files", { "index.html", "index.htm" }); -- cgit v1.2.3 From 593b5348efee34f9db46f20eb95415dbc4247e5b Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 21 Mar 2017 12:08:29 +0100 Subject: mod_posix: Use path variant of config API for pidfile option --- plugins/mod_posix.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 0a6845ac..2103071a 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -80,7 +80,7 @@ local function write_pidfile() if pidfile_handle then remove_pidfile(); end - pidfile = module:get_option_string("pidfile"); + pidfile = module:get_option_path("pidfile", nil, "data"); if pidfile then local err; local mode = stat(pidfile) and "r+" or "w+"; -- cgit v1.2.3 From ccb4cfcc212b83e1528115aae7095e710e550dbd Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 22 Mar 2017 14:13:28 +0100 Subject: MUC: Log when denying entry to locked room --- plugins/muc/muc.lib.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index cc147d19..df4c50bb 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -496,6 +496,7 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc self.locked = nil; -- Older groupchat protocol doesn't lock end elseif self.locked then -- Deny entry + module:log("debug", "Room is locked, denying entry"); origin.send(st.error_reply(stanza, "cancel", "item-not-found")); return; end -- cgit v1.2.3