diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-05-07 16:17:48 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-05-07 16:17:48 +0500 |
| commit | cfb093a9f4e464fba1e56c2e3e340ece4219a411 (patch) | |
| tree | 356e76e982f915b8a9887af0b7cdadc7cecaa4e2 | |
| parent | 5459f25151b4de3d3d51120dbf2a6ee8ebabb088 (diff) | |
| parent | c43b31011fc3d488b33945f64c0362666ca96913 (diff) | |
| download | prosody-cfb093a9f4e464fba1e56c2e3e340ece4219a411.tar.gz prosody-cfb093a9f4e464fba1e56c2e3e340ece4219a411.zip | |
Merge 0.6->0.7
| -rw-r--r-- | plugins/mod_console.lua | 5 | ||||
| -rw-r--r-- | plugins/mod_posix.lua | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index 4180e2b6..e87ef536 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -85,9 +85,10 @@ function console_listener.onincoming(conn, data) session.env._ = data; - local chunk, err = loadstring("return "..data); + local chunkname = "=console"; + local chunk, err = loadstring("return "..data, chunkname); if not chunk then - chunk, err = loadstring(data); + chunk, err = loadstring(data, chunkname); if not chunk then err = err:gsub("^%[string .-%]:%d+: ", ""); err = err:gsub("^:%d+: ", ""); diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 5888ae10..c38f7eba 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -82,6 +82,7 @@ local function write_pidfile() end pidfile = module:get_option("pidfile"); if pidfile then + local err; local mode = stat(pidfile) and "r+" or "w+"; pidfile_handle, err = io.open(pidfile, mode); if not pidfile_handle then |