Software / code / prosody
Changeset
8561:7b9ffddc4276
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 06 Mar 2018 01:45:58 +0100 |
| parents | 8558:5de663cef508 (current diff) 8560:489998717387 (diff) |
| children | 8562:a6188f5d5bb5 |
| files | core/hostmanager.lua prosodyctl |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/hostmanager.lua Sat Mar 03 20:55:46 2018 +0100 +++ b/core/hostmanager.lua Tue Mar 06 01:45:58 2018 +0100 @@ -84,6 +84,9 @@ send = host_send; modules = {}; }; + function host_session:close(reason) + log("debug", "Attempt to close host session %s with reason: %s", self.host, reason); + end setmetatable(host_session, host_mt); if not host_config.component_module then -- host host_session.type = "local";
--- a/prosodyctl Sat Mar 03 20:55:46 2018 +0100 +++ b/prosodyctl Tue Mar 06 01:45:58 2018 +0100 @@ -866,7 +866,7 @@ assert(input:close()); assert(output:close()); if owner and group then - local ok = os.execute(("chown %s.%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to))); + local ok = os.execute(("chown %s:%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to))); assert(ok == true or ok == 0, "Failed to change ownership of "..to); end if old_umask then pposix.umask(old_umask); end
