Merge s2s branch

[prosody.git] / util-src / pposix.c

diff --git a/util-src/pposix.c b/util-src/pposix.c
index 99a308cfea8f79ac8c626ad2392523cde2ed86d6..f5cc827032976c74c3ac624620b46aebb85c658a 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -13,7 +13,7 @@
 * POSIX support functions for Lua
 */
 
-#define MODULE_VERSION "0.3.5"
+#define MODULE_VERSION "0.3.6"
 
 #include <stdlib.h>
 #include <math.h>
@@ -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;
 }