aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-06-13 20:14:06 +0200
committerKim Alvefur <zash@zash.se>2017-06-13 20:14:06 +0200
commita8ab13b47364b6458b93cbf16ef579e183289d5a (patch)
tree98d1b668d63a65c58e169d1f7d3912050ef66de1
parent655752da9bed120b7419d575dbae0ed04916c4a3 (diff)
parent14f5606da9c3d220ecea41c0ed6563fe4b287677 (diff)
downloadprosody-a8ab13b47364b6458b93cbf16ef579e183289d5a.tar.gz
prosody-a8ab13b47364b6458b93cbf16ef579e183289d5a.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_posix.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 3fc57afc..49addafe 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -11,7 +11,8 @@ local want_pposix_version = "0.4.0";
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. Perhaps you need to recompile?", tostring(pposix._VERSION), want_pposix_version);
+ 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 have_signal, signal = pcall(require, "util.signal");
@@ -112,7 +113,7 @@ local function write_pidfile()
end
local syslog_opened;
-function syslog_sink_maker(config)
+function syslog_sink_maker(config) -- luacheck: ignore 212/config
if not syslog_opened then
pposix.syslog_open("prosody", module:get_option_string("syslog_facility"));
syslog_opened = true;