Skip to content

Commit

Permalink
remove error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
BuckarooBanzay committed Aug 10, 2020
1 parent 86f8f97 commit 1a1bda6
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 98 deletions.
4 changes: 1 addition & 3 deletions builtin/abm_calls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ minetest.register_on_mods_loaded(function()

metric.inc()
local t0 = minetest.get_us_time()
monitoring.protected_call(metric, function()
old_action(pos, node, active_object_count, active_object_count_wider)
end, pos)
old_action(pos, node, active_object_count, active_object_count_wider)
local t1 = minetest.get_us_time()
local diff = t1 - t0
metric_time.inc(diff)
Expand Down
7 changes: 1 addition & 6 deletions builtin/globalstep.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ minetest.register_on_mods_loaded(function()
for i, globalstep in ipairs(minetest.registered_globalsteps) do

local info = minetest.callback_origins[globalstep]
local error_state = {}

local new_callback = function(dtime)

Expand All @@ -26,11 +25,7 @@ minetest.register_on_mods_loaded(function()

metric.inc()
local t0 = minetest.get_us_time()

monitoring.protected_call(error_state, function()
globalstep(dtime)
end)

globalstep(dtime)
local t1 = minetest.get_us_time()
local diff = t1 - t0
metric_time.inc(diff)
Expand Down
4 changes: 1 addition & 3 deletions builtin/lbm_calls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ minetest.register_on_mods_loaded(function()

metric.inc()
local t0 = minetest.get_us_time()
monitoring.protected_call(metric, function()
old_action(pos, node)
end, pos)
old_action(pos, node)
local t1 = minetest.get_us_time()
local diff = t1 - t0
metric_time.inc(diff)
Expand Down
5 changes: 1 addition & 4 deletions builtin/nodetimer_calls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ minetest.register_on_mods_loaded(function()

metric.inc()
local t0 = minetest.get_us_time()
local result
monitoring.protected_call(metric, function()
result = old_action(pos, elapsed)
end, pos)
local result = old_action(pos, elapsed)
local t1 = minetest.get_us_time()
local diff = t1 - t0

Expand Down
52 changes: 0 additions & 52 deletions chatcommands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,55 +15,3 @@ minetest.register_chatcommand("metric", {
return true, "" .. metric.value or "<unknown>"
end
})



minetest.register_chatcommand("get_errors", {
description = "shows all catched errors",
func = function()
if not monitoring.settings.handle_errors then
return false, "Error-handling not enabled!"
end

local res = "List of handled errors: \n"
local count = 0

for _, metric in ipairs(monitoring.metrics) do
local pos_msg = ""
if metric.error_pos then
pos_msg = " at position " .. minetest.pos_to_string(metric.error_pos)
end

if metric.error then
count = count + 1
res = res .. metric.name .. ": " .. metric.error .. pos_msg .. "\n"
end
end

if count > 0 then
return true, res
else
return true, "No errors to report"
end
end
})


minetest.register_chatcommand("reset_errors", {
description = "resets all catched errors",
func = function()
if not monitoring.settings.handle_errors then
return false, "Error-handling not enabled!"
end

for _, metric in ipairs(monitoring.metrics) do
if metric.error then
metric.error = false
end
end

monitoring.error_count_metric.set(0)

return true, "Error state reset"
end
})
4 changes: 1 addition & 3 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ monitoring = {
builtin_disable = minetest.settings:get_bool("monitoring.builtin_disable"),
csv_enable = minetest.settings:get_bool("monitoring.csv_enable"),
json_enable = minetest.settings:get_bool("monitoring.json_enable"),
debug = minetest.settings:get_bool("monitoring.debug"),
handle_errors = minetest.settings:get_bool("monitoring.handle_errors")
debug = minetest.settings:get_bool("monitoring.debug")
}
}

Expand All @@ -23,7 +22,6 @@ dofile(MP.."/metrictypes/gauge.lua")
dofile(MP.."/metrictypes/counter.lua")
dofile(MP.."/metrictypes/histogram.lua")

dofile(MP.."/protected_call.lua")
dofile(MP.."/chatcommands.lua")
dofile(MP.."/register.lua")
dofile(MP.."/sampling.lua")
Expand Down
27 changes: 0 additions & 27 deletions protected_call.lua

This file was deleted.

0 comments on commit 1a1bda6

Please sign in to comment.