aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-08 16:56:40 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-08 16:56:40 +0100
commit844700e02344353b1aca6f28414bf0a5ddf2bd23 (patch)
tree07785222c69125735d53a89a36bcc57454a7f3c0
parent131f865ac287fd7a5e07c993672f1337d0c85efc (diff)
downloadprosody-844700e02344353b1aca6f28414bf0a5ddf2bd23.tar.gz
prosody-844700e02344353b1aca6f28414bf0a5ddf2bd23.zip
util.pposix: syslog(): Support an optional source parameter (producing messages of the form '<source>: <message>'
-rw-r--r--util-src/pposix.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/util-src/pposix.c b/util-src/pposix.c
index 99a308cf..c8c25ba9 100644
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -204,12 +204,13 @@ int level_constants[] = {
};
int lc_syslog_log(lua_State* L)
{
- int level = luaL_checkoption(L, 1, "notice", level_strings);
- level = level_constants[level];
+ int level = level_constants[luaL_checkoption(L, 1, "notice", level_strings)];
- luaL_checkstring(L, 2);
+ if(lua_gettop(L) == 3)
+ syslog(level, "%s: %s", luaL_checkstring(L, 2), luaL_checkstring(L, 3));
+ else
+ syslog(level, "%s", lua_tostring(L, 2));
- syslog(level, "%s", lua_tostring(L, 2));
return 0;
}