logging.lua

@@ -9,39 +9,21 @@ local loglevels={
 	["TRACE"]=6
 }
 local loglevels_index={}
-local loglevels_abbrev={}
 for k, v in pairs(loglevels) do
 	loglevels_index[v]=k
-	loglevels_abbrev[k:sub(1,1)]=v
-end
-
-local loglevel
-
----@deprecated use loglevel int
-local loglevel_str="INFO"
-
-
----@param level string|integer
-function logging.set(level)
-	--                                            +---we can do this
-	--                                            |   becasue each one has
-	--                                            v   a unique letter
-	loglevel=loglevels[level] or loglevels_abbrev[tostring(level):sub(1,1):upper()] or
-		((level >=0 and level <=6) and level) or loglevel
-end
-
----deprecated wrapper for logging.set, it is intentionally a wrapper instead of
---an alias because LuaLS docs don't work without doing this
----@deprecated user logging.set instead, more terse
-function logging.setLogLevel(level)
-	return logging.set(level)
 end
 
 -- default log level
-logging.set("INFO")
+local loglevel="INFO"
+
+function logging.setLogLevel(level)
+	loglevel=loglevels[level] and level or loglevel
+end
+
+logging.setLogLevel("INFO")
 
 local function printLog(severity, ...)
-	if (loglevel) >= severity then
+	if (loglevels[loglevel]) >= severity then
 		log("[" .. loglevels_index[severity] .. "] ", ...)
 	end
 end

sharedconfig.lua

@@ -1,13 +1,5 @@
 local sharedconfig={}
-
+local logging=require((...):gsub("(.)$", "%1.") .. 'logging')
-local fallback=setmetatable({}, {__index=function() return function() end end})
-local function optrequire(...)
-	local status, req=pcall(require, ...)
-	if status then return req end
-	return fallback
-end
-
-local logging=optrequire((...):gsub("(.)$", "%1.") .. 'logging')
 local sharedstate=require((...):gsub("(.)$", "%1.") .. 'sharedstate')
 sharedstate=require('nulllib.sharedstate')
 

sharedstate.lua

@@ -1,13 +1,5 @@
 local sharedstate={}
-local fallback=setmetatable({}, {__index=function() return function() end end})
+local logging=require((...):gsub("(.)$", "%1.") .. 'logging')
-local function optrequire(...)
-	local status, req=pcall(require, ...)
-	if status then return req end
-	return fallback
-end
-
-
-local logging=optrequire((...):gsub("(.)$", "%1.") .. 'logging')
 
 -- function names
 local is_initialized, callback_value, set_value,