From 386a33ffd8dfad25fa970fabe3f8bdbed8137804 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 26 Aug 2023 11:54:58 -0400 Subject: [PATCH] #298 consistent log tags --- coordinator/session/apisessions.lua | 12 ++++++------ coordinator/startup.lua | 2 +- supervisor/session/svsessions.lua | 20 ++++++++++---------- supervisor/startup.lua | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/coordinator/session/apisessions.lua b/coordinator/session/apisessions.lua index c1f1d4e..6e8c771 100644 --- a/coordinator/session/apisessions.lua +++ b/coordinator/session/apisessions.lua @@ -42,8 +42,8 @@ local function _api_handle_outq(session) -- max 100ms spent processing queue if util.time() - handle_start > 100 then - log.warning("[API] out queue handler exceeded 100ms queue process limit") - log.warning(util.c("[API] offending session: ", session)) + log.warning("API: out queue handler exceeded 100ms queue process limit") + log.warning(util.c("API: offending session: ", session)) break end end @@ -63,7 +63,7 @@ local function _shutdown(session) end end - log.debug(util.c("[API] closed session ", session)) + log.debug(util.c("API: closed session ", session)) end -- PUBLIC FUNCTIONS -- @@ -114,7 +114,7 @@ function apisessions.establish_session(source_addr, version) setmetatable(pkt_s, mt) 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 @@ -130,7 +130,7 @@ function apisessions.check_all_watchdogs(timer_event) if session.open then local triggered = session.instance.check_wd(timer_event) if triggered then - log.debug(util.c("[API] watchdog closing session ", session, "...")) + log.debug(util.c("API: watchdog closing session ", session, "...")) _shutdown(session) end end @@ -156,7 +156,7 @@ function apisessions.free_all_closed() ---@param session pkt_session_struct 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 util.filter_table(self.sessions, f, on_delete) diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 5bbff2b..52405b9 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder") local apisessions = require("coordinator.session.apisessions") -local COORDINATOR_VERSION = "v1.0.6" +local COORDINATOR_VERSION = "v1.0.7" local println = util.println local println_ts = util.println_ts diff --git a/supervisor/session/svsessions.lua b/supervisor/session/svsessions.lua index 05b543b..166a067 100644 --- a/supervisor/session/svsessions.lua +++ b/supervisor/session/svsessions.lua @@ -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 plc_s.in_queue.push_data(PLC_S_DATA.BURN_RATE, cmd.val[2]) 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 else @@ -104,8 +104,8 @@ local function _sv_handle_outq(session) -- max 100ms spent processing queue if util.time() - handle_start > 100 then - log.debug("[SVS] supervisor out queue handler exceeded 100ms queue process limit") - log.debug(util.c("[SVS] offending session: ", session)) + log.debug("SVS: supervisor out queue handler exceeded 100ms queue process limit") + log.debug(util.c("SVS: offending session: ", session)) break end end @@ -139,7 +139,7 @@ local function _shutdown(session) end end - log.debug(util.c("[SVS] closed session ", session)) + log.debug(util.c("SVS: closed session ", session)) end -- close connections @@ -160,7 +160,7 @@ local function _check_watchdogs(sessions, timer_event) if session.open then local triggered = session.instance.check_wd(timer_event) if triggered then - log.debug(util.c("[SVS] watchdog closing session ", session, "...")) + log.debug(util.c("SVS: watchdog closing session ", session, "...")) _shutdown(session) end end @@ -174,7 +174,7 @@ local function _free_closed(sessions) ---@param session sv_session_structs 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 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) 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 @@ -357,7 +357,7 @@ function svsessions.establish_rtu_session(source_addr, advertisement, version) setmetatable(rtu_s, mt) 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 @@ -398,7 +398,7 @@ function svsessions.establish_crd_session(source_addr, version) setmetatable(crd_s, mt) 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 @@ -442,7 +442,7 @@ function svsessions.establish_pdg_session(source_addr, version) setmetatable(pdg_s, mt) 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 diff --git a/supervisor/startup.lua b/supervisor/startup.lua index c1a7036..45f4d4f 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor") local svsessions = require("supervisor.session.svsessions") -local SUPERVISOR_VERSION = "v1.0.0" +local SUPERVISOR_VERSION = "v1.0.1" local println = util.println local println_ts = util.println_ts