oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

HUD: Reject and warn on invalid stat types (#11548)

Browse source 
This comes into play on older servers which do not know the "stat" type.
Warnings are only logged once to avoid spam within globalstep callbacks
This commit is contained in:
SmallJoker 2021-08-21 20:04:04 +02:00 • committed by GitHub
parent a72d13064f
commit 0c1e9603db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 86 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/script/common/c_internal.cpp
View file

@ -18,10 +18,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "common/c_internal.h"
#include "util/numeric.h"
#include "debug.h"
#include "log.h"
#include "porting.h"
#include "settings.h"
#include <algorithm> // std::find
std::string script_get_backtrace(lua_State *L)
{
@ -135,24 +137,35 @@ void script_run_callbacks_f(lua_State *L, int nargs,
lua_remove(L, error_handler);
}
static void script_log(lua_State *L, const std::string &message,
std::ostream &log_to, bool do_error, int stack_depth)
static void script_log_add_source(lua_State *L, std::string &message, int stack_depth)
{
lua_Debug ar;
log_to << message << " ";
if (lua_getstack(L, stack_depth, &ar)) {
FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
log_to << "(at " << ar.short_src << ":" << ar.currentline << ")";
message.append(" (at " + std::string(ar.short_src) + ":"
+ std::to_string(ar.currentline) + ")");
} else {
log_to << "(at ?:?)";
message.append(" (at ?:?)");
}
log_to << std::endl;
}
if (do_error)
script_error(L, LUA_ERRRUN, NULL, NULL);
else
infostream << script_get_backtrace(L) << std::endl;
bool script_log_unique(lua_State *L, std::string message, std::ostream &log_to,
int stack_depth)
{
thread_local std::vector<u64> logged_messages;
script_log_add_source(L, message, stack_depth);
u64 hash = murmur_hash_64_ua(message.data(), message.length(), 0xBADBABE);
if (std::find(logged_messages.begin(), logged_messages.end(), hash)
== logged_messages.end()) {
logged_messages.emplace_back(hash);
log_to << message << std::endl;
return true;
}
return false;
}
DeprecatedHandlingMode get_deprecated_handling_mode()
@ -174,9 +187,18 @@ DeprecatedHandlingMode get_deprecated_handling_mode()
return ret;
}
void log_deprecated(lua_State *L, const std::string &message, int stack_depth)
void log_deprecated(lua_State *L, std::string message, int stack_depth)
{
DeprecatedHandlingMode mode = get_deprecated_handling_mode();
if (mode != DeprecatedHandlingMode::Ignore)
script_log(L, message, warningstream, mode == DeprecatedHandlingMode::Error, stack_depth);
if (mode == DeprecatedHandlingMode::Ignore)
return;
script_log_add_source(L, message, stack_depth);
warningstream << message << std::endl;
if (mode == DeprecatedHandlingMode::Error)
script_error(L, LUA_ERRRUN, NULL, NULL);
else
infostream << script_get_backtrace(L) << std::endl;
}