Skip to content

Added %D for 24-hour time and buffering to let Print() based logging … #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dekker3D wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added %D for 24-hour time and buffering to let Print() based logging … #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions GeminiLogging.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
-- Logging library (loosely) based on LuaLogging.
-- Comes with appenders for GeminiConsole and Print() Debug Channel.
-------------------------------------------------------------------------------
local MAJOR,MINOR = "Gemini:Logging-1.2", 3

require "GameLib"

local MAJOR,MINOR = "Gemini:Logging-1.2", 4
-- Get a reference to the package information if any
local APkg = Apollo.GetPackage(MAJOR)
-- If there was an older version loaded we need to see if this is newer
Expand Down Expand Up @@ -350,6 +353,8 @@ function GeminiLogging:OnLoad()
self[self.LEVEL[i]] = self.LEVEL[i]
self.LEVEL[self.LEVEL[i]] = i
end

self.buffering = true

end

Expand All @@ -359,6 +364,10 @@ function GeminiLogging:OnDependencyError(strDep, strError)
return false
end

function GeminiLogging:FlushBuffer()
self.buffering = false
end

-- Factory method for loggers
function GeminiLogging:GetLogger(optSettings)
local opt
Expand All @@ -376,6 +385,10 @@ function GeminiLogging:GetLogger(optSettings)

-- Initialize logger object
local logger = {}
if self.buffering then
logger.buffer = {}
end
Apollo.RegisterEventHandler("InterfaceMenuListHasLoaded", "OnGameLoaded", logger)

-- Set appender
if not opt.appender or type(opt.appender) == "string" then
Expand Down Expand Up @@ -414,7 +427,13 @@ function GeminiLogging:GetLogger(optSettings)
local message = type(fmt) == "string" and strformat(fmt, ...) or fmt
caller = string.gsub(caller, "." .. ext, "")
local line = debugInfo.currentline or "-"
logger:append(GeminiLogging.PrepareLogMessage(logger, message, upperName, caller, line)) -- Give the appender the level string
local logMessage = GeminiLogging.PrepareLogMessage(logger, message, upperName, caller, line)
if GeminiLogging.buffering then
table.insert(self.buffer, logMessage)
else
logger.FlushBuffer()
logger:append(logMessage)
end
end
end

Expand All @@ -426,6 +445,20 @@ function GeminiLogging:GetLogger(optSettings)
Print("Invalid Logging Level: " .. level)
end
end

logger.FlushBuffer = function(self)
if logger.buffer ~= nil then
for _, v in ipairs(logger.buffer) do
logger:append(v)
end
logger.buffer = nil
end
GeminiLogging:FlushBuffer()
end

logger.OnGameLoaded = function(self)
self.FlushBuffer()
end

return logger
end
Expand All @@ -443,6 +476,7 @@ function GeminiLogging:PrepareLogMessage(message, level, caller, line)
local logMsg = self.pattern
message = string.gsub(message, "%%", "%%%%")
logMsg = string.gsub(logMsg, "%%d", os.date("%I:%M:%S%p")) -- only time, in 12-hour AM/PM format. This could be configurable...
logMsg = string.gsub(logMsg, "%%D", os.date("%H:%M:%S")) -- only time, in 12-hour AM/PM format. This could be configurable...
logMsg = string.gsub(logMsg, "%%l", level)
logMsg = string.gsub(logMsg, "%%c", caller)
logMsg = string.gsub(logMsg, "%%n", line)
Expand Down