Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

#298 consistent log tags

Browse Source
This commit is contained in:
Mikayla Fischler 2023-08-26 11:54:58 -04:00
parent b7d4468cea
commit 386a33ffd8
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coordinator/session/apisessions.lua
View File

@ -42,8 +42,8 @@ local function _api_handle_outq(session)
-- max 100ms spent processing queue -- max 100ms spent processing queue
if util.time() - handle_start > 100 then if util.time() - handle_start > 100 then
log.warning("[API] out queue handler exceeded 100ms queue process limit") log.warning("API: out queue handler exceeded 100ms queue process limit")
log.warning(util.c("[API] offending session: ", session)) log.warning(util.c("API: offending session: ", session))
break break
end end
end end
@ -63,7 +63,7 @@ local function _shutdown(session)
end end
end end
log.debug(util.c("[API] closed session ", session)) log.debug(util.c("API: closed session ", session))
end end
-- PUBLIC FUNCTIONS -- -- PUBLIC FUNCTIONS --
@ -114,7 +114,7 @@ function apisessions.establish_session(source_addr, version)
setmetatable(pkt_s, mt) setmetatable(pkt_s, mt)
iocontrol.fp_pkt_connected(id, version, source_addr) iocontrol.fp_pkt_connected(id, version, source_addr)
log.debug(util.c("[API] established new session: ", pkt_s)) log.debug(util.c("API: established new session: ", pkt_s))
self.next_id = id + 1 self.next_id = id + 1
@ -130,7 +130,7 @@ function apisessions.check_all_watchdogs(timer_event)
if session.open then if session.open then
local triggered = session.instance.check_wd(timer_event) local triggered = session.instance.check_wd(timer_event)
if triggered then if triggered then
log.debug(util.c("[API] watchdog closing session ", session, "...")) log.debug(util.c("API: watchdog closing session ", session, "..."))
_shutdown(session) _shutdown(session)
end end
end end
@ -156,7 +156,7 @@ function apisessions.free_all_closed()
---@param session pkt_session_struct ---@param session pkt_session_struct
local on_delete = function (session) local on_delete = function (session)
log.debug(util.c("[API] free'ing closed session ", session)) log.debug(util.c("API: free'ing closed session ", session))
end end
util.filter_table(self.sessions, f, on_delete) util.filter_table(self.sessions, f, on_delete)

2
coordinator/startup.lua
View File

@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder")
local apisessions = require("coordinator.session.apisessions") local apisessions = require("coordinator.session.apisessions")
local COORDINATOR_VERSION = "v1.0.6" local COORDINATOR_VERSION = "v1.0.7"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts

20
supervisor/session/svsessions.lua
View File

@ -81,7 +81,7 @@ local function _sv_handle_outq(session)
elseif cmd.key == SV_Q_DATA.SET_BURN and type(cmd.val) == "table" and #cmd.val == 2 then elseif cmd.key == SV_Q_DATA.SET_BURN and type(cmd.val) == "table" and #cmd.val == 2 then
plc_s.in_queue.push_data(PLC_S_DATA.BURN_RATE, cmd.val[2]) plc_s.in_queue.push_data(PLC_S_DATA.BURN_RATE, cmd.val[2])
else else
log.debug(util.c("[SVS] unknown PLC SV queue command ", cmd.key)) log.debug(util.c("SVS: unknown PLC SV queue command ", cmd.key))
end end
end end
else else
@ -104,8 +104,8 @@ local function _sv_handle_outq(session)
-- max 100ms spent processing queue -- max 100ms spent processing queue
if util.time() - handle_start > 100 then if util.time() - handle_start > 100 then
log.debug("[SVS] supervisor out queue handler exceeded 100ms queue process limit") log.debug("SVS: supervisor out queue handler exceeded 100ms queue process limit")
log.debug(util.c("[SVS] offending session: ", session)) log.debug(util.c("SVS: offending session: ", session))
break break
end end
end end
@ -139,7 +139,7 @@ local function _shutdown(session)
end end
end end
log.debug(util.c("[SVS] closed session ", session)) log.debug(util.c("SVS: closed session ", session))
end end
-- close connections -- close connections
@ -160,7 +160,7 @@ local function _check_watchdogs(sessions, timer_event)
if session.open then if session.open then
local triggered = session.instance.check_wd(timer_event) local triggered = session.instance.check_wd(timer_event)
if triggered then if triggered then
log.debug(util.c("[SVS] watchdog closing session ", session, "...")) log.debug(util.c("SVS: watchdog closing session ", session, "..."))
_shutdown(session) _shutdown(session)
end end
end end
@ -174,7 +174,7 @@ local function _free_closed(sessions)
---@param session sv_session_structs ---@param session sv_session_structs
local on_delete = function (session) local on_delete = function (session)
log.debug(util.c("[SVS] free'ing closed session ", session)) log.debug(util.c("SVS: free'ing closed session ", session))
end end
util.filter_table(sessions, f, on_delete) util.filter_table(sessions, f, on_delete)
@ -312,7 +312,7 @@ function svsessions.establish_plc_session(source_addr, for_reactor, version)
setmetatable(plc_s, mt) setmetatable(plc_s, mt)
databus.tx_plc_connected(for_reactor, version, source_addr) databus.tx_plc_connected(for_reactor, version, source_addr)
log.debug(util.c("[SVS] established new session: ", plc_s)) log.debug(util.c("SVS: established new session: ", plc_s))
self.next_ids.plc = id + 1 self.next_ids.plc = id + 1
@ -357,7 +357,7 @@ function svsessions.establish_rtu_session(source_addr, advertisement, version)
setmetatable(rtu_s, mt) setmetatable(rtu_s, mt)
databus.tx_rtu_connected(id, version, source_addr) databus.tx_rtu_connected(id, version, source_addr)
log.debug(util.c("[SVS] established new session: ", rtu_s)) log.debug(util.c("SVS: established new session: ", rtu_s))
self.next_ids.rtu = id + 1 self.next_ids.rtu = id + 1
@ -398,7 +398,7 @@ function svsessions.establish_crd_session(source_addr, version)
setmetatable(crd_s, mt) setmetatable(crd_s, mt)
databus.tx_crd_connected(version, source_addr) databus.tx_crd_connected(version, source_addr)
log.debug(util.c("[SVS] established new session: ", crd_s)) log.debug(util.c("SVS: established new session: ", crd_s))
self.next_ids.crd = id + 1 self.next_ids.crd = id + 1
@ -442,7 +442,7 @@ function svsessions.establish_pdg_session(source_addr, version)
setmetatable(pdg_s, mt) setmetatable(pdg_s, mt)
databus.tx_pdg_connected(id, version, source_addr) databus.tx_pdg_connected(id, version, source_addr)
log.debug(util.c("[SVS] established new session: ", pdg_s)) log.debug(util.c("SVS: established new session: ", pdg_s))
self.next_ids.pdg = id + 1 self.next_ids.pdg = id + 1

2
supervisor/startup.lua
View File

@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
local svsessions = require("supervisor.session.svsessions") local svsessions = require("supervisor.session.svsessions")
local SUPERVISOR_VERSION = "v1.0.0" local SUPERVISOR_VERSION = "v1.0.1"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts