output-lua: register common callbacks

Clean up callback registration in the setup-stage and register
common callbacks.

diff --git a/src/output-lua.c b/src/output-lua.c
index 97cebb2c7ecbc0fc9303cd0a0e590ea6e2606e47..18ebdff64f955813230244964d4fd04ab826d546 100644 (file)
--- a/src/output-lua.c
+++ b/src/output-lua.c
@@ -431,10 +431,11 @@ static lua_State *LuaScriptSetup(const char *filename)
     }
     //LuaPrintStack(luastate);
 
-    if (1) { //http
-        if (LogLuaRegisterHttpFunctions(luastate) != 0)
-            SCLogInfo("boooh!");
-    }
+    /* register functions common to all */
+    LogLuaRegisterFunctions(luastate);
+    /* unconditionally register http function. They will only work
+     * if the tx is registered in the state at runtime though. */
+    LogLuaRegisterHttpFunctions(luastate);
 
     SCLogDebug("lua_State %p is set up", luastate);
     return luastate;