From: Tobias Ulmer <tu@emlix.com>
Date: Mon, 19 Nov 2018 17:00:41 +0000 (+0100)
Subject: e2tool: open debug.log after loading e2.conf
X-Git-Tag: e2factory-2.3.18rc1~69
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=0b9c11cc04d8ea89ec3bd1fa5f6a09104efa5adf;p=e2factory.git

e2tool: open debug.log after loading e2.conf

Makes debug.log respect config.log.logrotate.
Closes bz#236.

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

diff --git a/local/e2tool.lua b/local/e2tool.lua
index c669a67..dd52843 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -797,14 +797,16 @@ function e2tool.e2project_class:load_project(skip_load_config)
         e2lib.abort(re)
     end
 
-    rc, re = opendebuglogfile()
+    -- load e2.conf and do basic initialization
+    rc, re = e2lib.init2()
     if not rc then
-        return false, e:cat(re)
+        return false, re
     end
 
-    rc, re = e2lib.init2() -- configuration must be available
+    -- open debug.log after config.log.logrotate has come into effect
+    rc, re = opendebuglogfile()
     if not rc then
-        return false, re
+        return false, e:cat(re)
     end
 
     if skip_load_config == true then