aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-08 17:22:15 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-08 17:22:15 +0100
commit22baeb39fe3c291e7f98977b7fa6af8353d910dd (patch)
treeb63f60f6dff8c647f5952a2a92bb0a1da8d2a94f /plugins
parent4f4ea37379152abaee179a750a24f7019c405583 (diff)
parent0ce5c766ac0a68a167a9fa26b931c56d35ae785b (diff)
downloadprosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.tar.gz
prosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_posix.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index e871e5cf..28fd7f38 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -7,10 +7,12 @@
--
-local want_pposix_version = "0.3.5";
+local want_pposix_version = "0.3.6";
local pposix = assert(require "util.pposix");
-if pposix._VERSION ~= want_pposix_version then module:log("warn", "Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version); end
+if pposix._VERSION ~= want_pposix_version then
+ module:log("warn", "Unknown version (%s) of binary pposix module, expected %s. Perhaps you need to recompile?", tostring(pposix._VERSION), want_pposix_version);
+end
local signal = select(2, pcall(require, "util.signal"));
if type(signal) == "string" then
@@ -118,9 +120,9 @@ function syslog_sink_maker(config)
local syslog, format = pposix.syslog_log, string.format;
return function (name, level, message, ...)
if ... then
- syslog(level, format(message, ...));
+ syslog(level, name, format(message, ...));
else
- syslog(level, message);
+ syslog(level, name, message);
end
end;
end