Skip to content

Commit

Permalink
Make Logger optional (#29)
Browse files Browse the repository at this point in the history
* Make Logger optional

* Update README

* Fix table
  • Loading branch information
brandonsturgeon committed Nov 9, 2022
1 parent 456e7b8 commit 9e1f1d1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This addon will watch for errors, do a little investigation, and send a message
- 🔎 Shows you the current values of up to 8 local variables in the stack that threw an error (very useful for debugging!)

## Requirements
- [gm_logger](https://github.com/CFC-Servers/gm_logger)
- [gm_logger](https://github.com/CFC-Servers/gm_logger) _(Optional)_
- [gm_luaerror](https://github.com/danielga/gm_luaerror)
- [gmsv_reqwest](https://github.com/WilliamVenner/gmsv_reqwest)

Expand Down
23 changes: 18 additions & 5 deletions moon/autorun/server/cfc_err_fwd.moon
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require "luaerror"
require "logger"
require "reqwest"

timerName = "CFC_ErrorForwarderQueue"
Expand Down Expand Up @@ -28,15 +27,29 @@ Config =
-- cfc_err_forwarder_server_webhook
server: makeConfig "server_webhook", "", "Discord Webhook URL"

local logger
if file.Exists "includes/modules/logger.lua", "LUA"
require "logger"
logger = Logger "ErrorForwarder"
else
log = (...) -> print "[ErrorForwarder]", ...
log "GM_Logger not found, using backup logger. Consider installing: github.com/CFC-Servers/gm_logger"

logger =
trace: ->
debug: ->
info: log
warn: log
error: log


Logger = Logger "ErrorForwarder"
Discord = discordBuilder Config
ErrorForwarder = errorForwarder Logger, Discord, Config
ErrorForwarder = errorForwarder logger, Discord, Config


timer.Create timerName, Config.groomInterval\GetInt! or 60, 0, ->
success, err = pcall ErrorForwarder\groomQueue
Logger\error "Groom Queue failed!", err if not success
logger\error "Groom Queue failed!", err if not success

cvars.AddChangeCallback "cfc_err_forwarder_interval", (_, _, value) ->
timer.Adjust timerName, tonumber(value), "UpdateTimer"
Expand All @@ -45,4 +58,4 @@ hook.Add "LuaError", "CFC_ServerErrorForwarder", ErrorForwarder\receiveSVError
hook.Add "ClientLuaError", "CFC_ClientErrorForwarder", ErrorForwarder\receiveCLError
hook.Add "ShutDown", "CFC_ShutdownErrorForwarder", ErrorForwarder\forwardErrors

Logger\info "Loaded!"
logger\info "Loaded!"

0 comments on commit 9e1f1d1

Please sign in to comment.