mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 22:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.6->0.7

Browse source
This commit is contained in:
Waqas Hussain 2010-05-07 16:17:48 +05:00
commit cfb093a9f4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/mod_console.lua
View file

@ -85,9 +85,10 @@ function console_listener.onincoming(conn, data)
session.env._ = data; session.env._ = data;
local chunk, err = loadstring("return "..data); local chunkname = "=console";
local chunk, err = loadstring("return "..data, chunkname);
if not chunk then if not chunk then
chunk, err = loadstring(data); chunk, err = loadstring(data, chunkname);
if not chunk then if not chunk then
err = err:gsub("^%[string .-%]:%d+: ", ""); err = err:gsub("^%[string .-%]:%d+: ", "");
err = err:gsub("^:%d+: ", ""); err = err:gsub("^:%d+: ", "");

1
plugins/mod_posix.lua
View file

@ -82,6 +82,7 @@ local function write_pidfile()
end end
pidfile = module:get_option("pidfile"); pidfile = module:get_option("pidfile");
if pidfile then if pidfile then
local err;
local mode = stat(pidfile) and "r+" or "w+"; local mode = stat(pidfile) and "r+" or "w+";
pidfile_handle, err = io.open(pidfile, mode); pidfile_handle, err = io.open(pidfile, mode);
if not pidfile_handle then if not pidfile_handle then