From 8035d31109964504d970ed302c7aa6ffa0a8f106 Mon Sep 17 00:00:00 2001 From: jussi Date: Fri, 4 Mar 2022 15:46:22 +0200 Subject: Custom log function. --- src/lua_core.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/main.c | 1 - 2 files changed, 40 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lua_core.c b/src/lua_core.c index 55e0fda..ece4c97 100644 --- a/src/lua_core.c +++ b/src/lua_core.c @@ -204,6 +204,44 @@ void defineGlobals() { /*DOC_END*/ } +// Custom logging funtion +void LogCustom( int msgType, const char *text, va_list args ) { + char string[ STRING_LEN ] = {'\0'}; + char msg[ STRING_LEN ] = {'\0'}; + + vsprintf( string, text, args ); + + switch ( msgType ) { + case LOG_ALL: sprintf( msg, "ALL: %s", string ); break; + case LOG_TRACE: sprintf( msg, "TRACE: %s", string ); break; + case LOG_DEBUG: sprintf( msg, "DEBUG: %s", string ); break; + case LOG_INFO: sprintf( msg, "INFO: %s", string ); break; + case LOG_WARNING: sprintf( msg, "WARNING: %s", string ); break; + case LOG_ERROR: sprintf( msg, "ERROR: %s", string ); break; + case LOG_FATAL: sprintf( msg, "FATAL: %s", string ); break; + default: break; + } + printf( "%s\n", msg ); + + /* Call Lua log function if exists. */ + lua_State *L = state->luaState; + + lua_pushcfunction( L, luaTraceback ); + int tracebackidx = lua_gettop( L ); + lua_getglobal( L, "log" ); + + if ( lua_isfunction( L, -1 ) ) { + lua_pushstring( L, msg ); + + if ( lua_pcall( L, 1, 0, tracebackidx ) != 0 ) { + TraceLog( LOG_WARNING, "Lua error: %s", lua_tostring( L, -1 ) ); + state->run = false; + return; + } + } + lua_pop( L, -1 ); +} + bool luaInit() { state->luaState = luaL_newstate(); @@ -284,6 +322,8 @@ bool luaCallMain() { TraceLog( LOG_WARNING, "%s", "No Lua main found!" ); return false; } + /* Apply custom callback here. */ + SetTraceLogCallback( LogCustom ); return true; } diff --git a/src/main.c b/src/main.c index cd060d4..9bb5d2e 100644 --- a/src/main.c +++ b/src/main.c @@ -18,7 +18,6 @@ int main( int argn, const char **argc ) { else { sprintf( exePath, "%s/", GetWorkingDirectory() ); } - TraceLog( LOG_INFO, "ReiLua %d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ); stateInit( exePath ); -- cgit v1.2.3