Validate log message levels

mods/nc_api/fx_digparticles.lua

@@ -20,7 +20,7 @@ function nodecore.digparticles(nodedef, partdef)
 	elseif nodedef.inventory_image then
 		img[1] = nodedef.inventory_image
 	end
-	if #img < 1 then return minetest.log("error", "no pummel tile images found!") end
+	if #img < 1 then return nodecore.log("error", "no pummel tile images found!") end
 	img = nodecore.pickrand(img)
 	if img.name then img = img.name end
 

mods/nc_api/init.lua

@@ -1,9 +1,9 @@
 -- LUALOCALS < ---------------------------------------------------------
 -- SKIP: include nodecore
 local dofile, error, minetest, pairs, rawget, rawset, setmetatable,
-      table, type
+      table, tostring, type
     = dofile, error, minetest, pairs, rawget, rawset, setmetatable,
-      table, type
+      table, tostring, type
 local table_concat, table_insert
     = table.concat, table.insert
 -- LUALOCALS > ---------------------------------------------------------
@@ -52,6 +52,12 @@ minetest.register_on_mods_loaded(function()
 		end
 	end)
 
+local levels = {none = true, error = true, warning = true, action = true, info = true, verbose = true}
+function nodecore.log(level, ...)
+	if not level or not levels[level] then error("invalid log level " .. tostring(level)) end
+	return minetest.log(level, ...)
+end
+
 include("compat_vector")
 include("issue9043")
 

mods/nc_api/item_txp_overlay.lua

@@ -12,7 +12,7 @@ minetest.after(0, function()
 		for k in pairs(missing) do t[#t + 1] = k end
 		if #t < 1 then return end
 		table_sort(t)
-		minetest.log("warning", "WARNING: missing txp override images:\n\t"
+		nodecore.log("warning", "WARNING: missing txp override images:\n\t"
 			.. table_concat(t, "\n\t"))
 	end)
 

mods/nc_api/mapgen_limits.lua

@@ -14,5 +14,5 @@ local limitchunks = math_floor(limit / chunksize)
 nodecore.map_limit_min = (-limitchunks + 0.5) * chunksize + 7.5
 nodecore.map_limit_max = (limitchunks - 0.5) * chunksize + 7.5
 
-minetest.log("info", string_format("mapgen limit: %d, chunk: %d, bounds: %0.1f to %0.1f",
+nodecore.log("info", string_format("mapgen limit: %d, chunk: %d, bounds: %0.1f to %0.1f",
 		limit, chunksize, nodecore.map_limit_min, nodecore.map_limit_max))

mods/nc_api/util_gametime.lua

@@ -9,12 +9,12 @@ minetest.register_globalstep(function(dtime)
 		local mtt = minetest.get_gametime()
 		local nct = nodecore.gametime
 		if not nct then
-			minetest.log("info", "nodecore.gametime: init to " .. mtt)
+			nodecore.log("info", "nodecore.gametime: init to " .. mtt)
 			nct = mtt
 		end
 		nct = nct + dtime
 		if math_abs(nct - mtt) >= 2 then
-			minetest.log("info", "nodecore.gametime: excess drift; nct="
+			nodecore.log("info", "nodecore.gametime: excess drift; nct="
 				.. nct .. ", mtt=" .. mtt)
 			nct = mtt
 		end

mods/nc_api/util_misc.lua

@@ -310,7 +310,7 @@ function nodecore.node_spin_custom(...)
 		node = node or minetest.get_node(pos)
 		node.param2 = lut[node.param2] or lut[false]
 		if clicker:is_player() then
-			minetest.log("action", clicker:get_player_name() .. " spins "
+			nodecore.log("action", clicker:get_player_name() .. " spins "
 				.. node.name .. " at " .. minetest.pos_to_string(pos)
 				.. " to param2 " .. node.param2 .. " ("
 				.. qty .. " total)")

mods/nc_api_active/aism.lua

@@ -49,7 +49,7 @@ minetest.after(0, function()
 			defs = defs + n
 			if n > peak then peak = n end
 		end
-		minetest.log("info", string_format("register_aism: %d keys, %d defs, %d peak", keys, defs, peak))
+		nodecore.log("info", string_format("register_aism: %d keys, %d defs, %d peak", keys, defs, peak))
 	end)
 
 local function checkrun(def, stack, data)

mods/nc_api_active/limited_abm.lua

@@ -10,7 +10,7 @@ local pumpbatch = {}
 minetest.register_globalstep(function()
 		for def in pairs(pumpbatch) do
 			if def.limited_qty >= def.limited_alert then
-				minetest.log("warning", "limited abm \"" .. def.label .. "\" filled ("
+				nodecore.log("warning", "limited abm \"" .. def.label .. "\" filled ("
 					.. def.limited_qty .. "/" .. def.limited_max .. ")")
 			end
 

mods/nc_api_craft/craft_check.lua

@@ -137,7 +137,7 @@ local function craftcheck(recipe, pos, node, data, xx, xz, zx, zz)
 			function(p) return lut[minetest.hash_node_position(p)] end
 		)
 	end
-	minetest.log("action", (data.crafter and data.crafter:get_player_name() or "unknown")
+	nodecore.log("action", (data.crafter and data.crafter:get_player_name() or "unknown")
 		.. " completed recipe \"" .. recipe.label .. "\" at " ..
 		minetest.pos_to_string(pos) .. " upon " .. node.name)
 	return true

mods/nc_api_ents/util.lua

@@ -52,7 +52,7 @@ end
 tryhook()
 
 function nodecore.ent_prop_set(obj, def)
-	minetest.log("warning", "WARNING: nodecore.ent_prop_set() is now deprecated;"
+	nodecore.log("warning", "WARNING: nodecore.ent_prop_set() is now deprecated;"
 		.. " just use object:set_properties(), which has been patched")
 	return obj:set_properties(def)
 end

mods/nc_player_pickup/rearrange.lua

@@ -50,7 +50,7 @@ local function handlepickups(player)
 					v = nodecore.stack_merge(snap[j], v)
 				end
 				if not v:is_empty() then
-					minetest.log("error", "failed to reinsert item "
+					nodecore.log("error", "failed to reinsert item "
 						.. v:get_name() .. " " .. v:get_count()
 						.. " for " .. pname)
 					dirty = nil
@@ -67,7 +67,7 @@ local function handlepickups(player)
 		end
 
 		if dirty then
-			minetest.log("info", "inventory rearranged for " .. pname)
+			nodecore.log("info", "inventory rearranged for " .. pname)
 			inv:set_list("main", snap)
 		end
 	end

mods/nc_stats/init.lua

@@ -75,7 +75,7 @@ local function playeradd(qty, player, ...)
 	end
 	if qty ~= 0 and dbadd(qty, pname, ...) <= qty then
 		local t = {...}
-		minetest.log("action", string_format("player %q discovered %q",
+		nodecore.log("action", string_format("player %q discovered %q",
 				pname, table_concat(t, ":")))
 		for _, v in pairs(nodecore.registered_on_player_discovers) do
 			v(player, t)

mods/nc_tree/grow_node.lua

@@ -36,7 +36,7 @@ minetest.register_node(modname .. ":eggcorn", {
 			if nodecore.player_stat_add then
 				nodecore.player_stat_add(1, whom, "craft", "eggcorn planting")
 			end
-			minetest.log("action", (whom and whom:get_player_name() or "unknown")
+			nodecore.log("action", (whom and whom:get_player_name() or "unknown")
 				.. " planted an eggcorn at " .. minetest.pos_to_string(pos))
 
 			stack:set_count(stack:get_count() - 1)

mods/nc_woodwork/rake.lua

@@ -52,7 +52,7 @@ end
 local function matching(pa, na, pb, nb)
 	if stackonly[na.name] then
 		if not stackonly[nb.name] then return end
-		minetest.log("info", nodecore.stack_get(pa):get_name() .. " ?= "
+		nodecore.log("info", nodecore.stack_get(pa):get_name() .. " ?= "
 			.. nodecore.stack_get(pb):get_name())
 		return (laststack and laststack:get_name()) == nodecore.stack_get(pb):get_name()
 	end