diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 53412d1..d3e0f5c 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.2.9" +local COORDINATOR_VERSION = "v1.2.10" local CHUNK_LOAD_DELAY_S = 30.0 @@ -76,9 +76,13 @@ if loaded ~= 0 then local success, error = configure.configure(loaded, monitors) if success then loaded, monitors = coordinator.load_config() - assert(loaded == 0, util.trinary(loaded == 1, "failed to load valid configuration", "monitor configuration invalid")) + if loaded ~= 0 then + println(util.trinary(loaded == 2, "monitor configuration invalid", "failed to load a valid configuration") .. ", please reconfigure") + return + end else - assert(success, "coordinator configuration error: " .. error) + println("configuration error: " .. error) + return end end diff --git a/pocket/startup.lua b/pocket/startup.lua index 13ac7fd..bbd8587 100644 --- a/pocket/startup.lua +++ b/pocket/startup.lua @@ -18,7 +18,7 @@ local iocontrol = require("pocket.iocontrol") local pocket = require("pocket.pocket") local renderer = require("pocket.renderer") -local POCKET_VERSION = "v0.7.0-alpha" +local POCKET_VERSION = "v0.7.1-alpha" local println = util.println local println_ts = util.println_ts @@ -31,9 +31,13 @@ if not pocket.load_config() then -- try to reconfigure (user action) local success, error = configure.configure(true) if success then - assert(pocket.load_config(), "failed to load valid configuration") + if not pocket.load_config() then + println("failed to load a valid configuration, please reconfigure") + return + end else - assert(success, "pocket configuration error: " .. error) + println("configuration error: " .. error) + return end end diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua index f67e60f..9c3d382 100644 --- a/reactor-plc/startup.lua +++ b/reactor-plc/startup.lua @@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc") local renderer = require("reactor-plc.renderer") local threads = require("reactor-plc.threads") -local R_PLC_VERSION = "v1.6.13" +local R_PLC_VERSION = "v1.6.14" local println = util.println local println_ts = util.println_ts @@ -31,9 +31,13 @@ if not plc.load_config() then -- try to reconfigure (user action) local success, error = configure.configure(true) if success then - assert(plc.load_config(), "failed to load valid configuration") + if not plc.load_config() then + println("failed to load a valid configuration, please reconfigure") + return + end else - assert(success, "reactor PLC configuration error: " .. error) + println("configuration error: " .. error) + return end end diff --git a/rtu/startup.lua b/rtu/startup.lua index d58639c..1c5a4a2 100644 --- a/rtu/startup.lua +++ b/rtu/startup.lua @@ -31,7 +31,7 @@ local sna_rtu = require("rtu.dev.sna_rtu") local sps_rtu = require("rtu.dev.sps_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu") -local RTU_VERSION = "v1.7.13" +local RTU_VERSION = "v1.7.14" local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE @@ -47,9 +47,13 @@ if not rtu.load_config() then -- try to reconfigure (user action) local success, error = configure.configure(true) if success then - assert(rtu.load_config(), "failed to load valid configuration") + if not rtu.load_config() then + println("failed to load a valid configuration, please reconfigure") + return + end else - assert(success, "RTU configuration error: " .. error) + println("configuration error: " .. error) + return end end diff --git a/supervisor/startup.lua b/supervisor/startup.lua index b45947e..7176c3e 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.2.9" +local SUPERVISOR_VERSION = "v1.2.10" local println = util.println local println_ts = util.println_ts @@ -34,9 +34,13 @@ if not supervisor.load_config() then -- try to reconfigure (user action) local success, error = configure.configure(true) if success then - assert(supervisor.load_config(), "failed to load valid configuration") + if not supervisor.load_config() then + println("failed to load a valid configuration, please reconfigure") + return + end else - assert(success, "supervisor configuration error: " .. error) + println("configuration error: " .. error) + return end end