Skip to contentSkip to conversation

Revert "tinfoil: fix duplication of log messages"

PATCH New Paul Eggleton 1 participant 2 messages Aug 7, 2017

lore
Share & tools
lore
#0 lore raw

cover Revert "tinfoil: fix duplication of log messages"

The following changes since commit 76c4f2c20216719736766e8ae7d089ccd061b71b:

daemonize: Always print any remaning UI events at exit (2017-08-03 11:11:35 +0100)

are available in the git repository at:

git://git.openembedded.org/bitbake-contrib paule/bb-tinfoil-logging2
http://cgit.openembedded.org/bitbake-contrib/log/?h=paule/bb-tinfoil-logging2

Paul Eggleton (1):
Revert "tinfoil: fix duplication of log messages"

 lib/bb/main.py    | 4 ++--
 lib/bb/tinfoil.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
Signature · 1 line
2.9.4
#1 lore raw

PATCH 1/1 Revert "tinfoil: fix duplication of log messages"

In combination with the recent server reworking, this change actually prevents messages sent from tasks from being logged properly. This will of course give us the duplicated messages back, and I really hate to do that effectively a second time, but that's better than seeing no error at all in the case of a failure - we'll have to find the proper way of avoiding the duplication that doesn't result in some messages going missing.

This reverts commit 8a5bae76f91f2411187c638a42fa3c762052cf11.

---
 lib/bb/main.py    | 4 ++--
 lib/bb/tinfoil.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
lib/bb/main.py +2 -2
index 431f6f4..c51c6f2 100755
@@ -394,10 +394,10 @@ def bitbake_main(configParams, configuration):
 
     return 1
 
-def setup_bitbake(configParams, configuration, extrafeatures=None, setup_logging=True):
+def setup_bitbake(configParams, configuration, extrafeatures=None):
     # Ensure logging messages get sent to the UI as events
     handler = bb.event.LogHandler()
-    if setup_logging and not configParams.status_only:
+    if not configParams.status_only:
         # In status only mode there are no logs and no UI
         logger.addHandler(handler)
 
lib/bb/tinfoil.py +1 -2
index e246b3d..cd0587e 100644
@@ -383,8 +383,7 @@ class Tinfoil:
 
         self.server_connection, ui_module = setup_bitbake(config_params,
                             cookerconfig,
-                            extrafeatures,
-                            setup_logging=False)
+                            extrafeatures)
 
         self.ui_module = ui_module
 
Signature · 1 line
2.9.4