From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 29 Jun 2012 19:19:25 +0000 (+0200)
Subject: Write log messages into a buffer until the log file is open
X-Git-Tag: e2factory-2.3.12rc1~36
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=a9809e380cc707748d1585353be591637223e59d;p=e2factory.git

Write log messages into a buffer until the log file is open

Write out buffer as soon as the log file becomes available.

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 5d65e51..a35b967 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -100,6 +100,8 @@ globals = {
   logrotate = 5,   -- configurable via config.log.logrotate
   _version = _version,
   _licence = _licence,
+  debuglogfile = nil,
+  debuglogfilebuffer = {},
 }
 
 -- Interrupt handling
@@ -379,18 +381,25 @@ function log(level, msg)
   if msg:match("\n$") then
     msg = msg:sub(1, msg:len() - 1)
   end
-  -- always write log level to debug logfile
+
   if globals.debuglogfile then
-    globals.debuglogfile:write(log_prefix .. msg)
-    globals.debuglogfile:write("\n")
+
+    -- write out buffered messages first
+    for _,m in ipairs(globals.debuglogfilebuffer) do
+      globals.debuglogfile:write(m)
+    end
+    globals.debuglogfilebuffer = {}
+
+    globals.debuglogfile:write(log_prefix .. msg .. "\n")
     globals.debuglogfile:flush()
+  else
+    table.insert(globals.debuglogfilebuffer, log_prefix .. msg .. "\n")
   end
   if getlog(level) then
     if globals.log_debug then
       io.stderr:write(log_prefix)
     end
-    io.stderr:write(msg)
-    io.stderr:write("\n")
+    io.stderr:write(msg .. "\n")
   end
   return nil
 end