Clean up logging a tad

This commit is contained in:
Jordan Irwin 2021-05-18 18:04:33 -07:00
parent 5a918081e2
commit 5c58fd8f5d

View file

@ -4,18 +4,20 @@
cleaner = {} cleaner = {}
cleaner.name = core.get_current_modname() cleaner.modname = core.get_current_modname()
local debug = core.settings:get_bool("enable_debug_mods") local cleaner_debug = core.settings:get_bool("enable_debug_mods", false)
local function log(level, msg) function cleaner.log(lvl, msg)
core.log(level, "[" .. cleaner.name .. "] " .. msg) if lvl == "debug" and not cleaner_debug then return end
end
local function logDebug(msg) msg = "[" .. cleaner.modname .. "] " .. msg
if debug then if lvl == "debug" then
core.log("DEBUG: [" .. cleaner.name .. "] " .. msg) msg = "[DEBUG] " .. msg
lvl = nil
end end
core.log(lvl, msg)
end end
@ -39,7 +41,7 @@ else
end end
if e_list then if e_list then
logDebug("Loading entities to clean from file ...") cleaner.log("debug", "Loading entities to clean from file ...")
e_list = string.split(e_list, "\n") e_list = string.split(e_list, "\n")
for _, entity_name in ipairs(e_list) do for _, entity_name in ipairs(e_list) do
@ -48,7 +50,7 @@ if e_list then
end end
for _, entity_name in ipairs(old_entities) do for _, entity_name in ipairs(old_entities) do
logDebug("Cleaning entity: " .. entity_name) cleaner.log("debug", "Cleaning entity: " .. entity_name)
core.register_entity(":" .. entity_name, { core.register_entity(":" .. entity_name, {
on_activate = function(self, staticdata) on_activate = function(self, staticdata)
@ -78,7 +80,7 @@ else
end end
if n_list then if n_list then
logDebug("Loading nodes to clean from file ...") cleaner.log("debug", "Loading nodes to clean from file ...")
n_list = string.split(n_list, "\n") n_list = string.split(n_list, "\n")
for _, node_name in ipairs(n_list) do for _, node_name in ipairs(n_list) do
@ -87,7 +89,7 @@ if n_list then
end end
for _, node_name in ipairs(old_nodes) do for _, node_name in ipairs(old_nodes) do
logDebug("Cleaning node: " .. node_name) cleaner.log("debug", "Cleaning node: " .. node_name)
core.register_node(":" .. node_name, { core.register_node(":" .. node_name, {
groups = {old=1}, groups = {old=1},