# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1497377646 -7200
# Node ID 45be94611593d2c6dc3fc4cbcbd4573541f6b27f
# Parent  e564f13b9582b251d5f3799ac2fba5f4de57d91e# Parent  39188851811ce033cd3a18944757f9f54e42192e
Merge 0.10->trunk

diff -r e564f13b9582 -r 45be94611593 plugins/mod_posix.lua
--- a/plugins/mod_posix.lua	Tue Jun 13 16:38:53 2017 +0200
+++ b/plugins/mod_posix.lua	Tue Jun 13 20:14:06 2017 +0200
@@ -11,7 +11,8 @@
 
 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 @@
 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;