BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix configuration caching in log_deprecated (#9697)

Browse Source 
* Fix configuration caching in log_deprecated

The configured variable was never set to true.
I've set the variables to thread_local because the configuration should be reloaded after reentering the world from mainmenu.
This commit is contained in:
HybridDog 2020-04-22 00:07:12 +02:00 committed by GitHub
parent 8ef239b448
commit 4361bfcb4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/script/common/c_internal.cpp
View File

@ -157,9 +157,9 @@ static void script_log(lua_State *L, const std::string &message,
void log_deprecated(lua_State *L, const std::string &message, int stack_depth)
{
static bool configured = false;
static bool do_log = false;
static bool do_error = false;
static thread_local bool configured = false;
static thread_local bool do_log = false;
static thread_local bool do_error = false;
// Only read settings on first call
if (!configured) {
@ -167,9 +167,10 @@ void log_deprecated(lua_State *L, const std::string &message, int stack_depth)
if (value == "log") {
do_log = true;
} else if (value == "error") {
do_log = true;
do_log = true;
do_error = true;
}
configured = true;
}
if (do_log)

2
src/script/lua_api/l_util.cpp
View File

@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// log([level,] text)
// Writes a line to the logger.
// The one-argument version logs to infostream.
// The one-argument version logs to LL_NONE.
// The two-argument version accepts a log level.
// Either the special case "deprecated" for deprecation notices, or any specified in
// Logger::stringToLevel(name).

2
src/script/lua_api/l_util.h
View File

@ -37,7 +37,7 @@ private:
// log([level,] text)
// Writes a line to the logger.
// The one-argument version logs to infostream.
// The one-argument version logs to LL_NONE.
// The two-argument version accepts a log level.
static int l_log(lua_State *L);