mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: main: Add timestamp to server retry messages

Browse Source 
We have timestamps in the server logs but we don't know which
UI messages correlate to them. Add some timestamps to the messages
which doesn't make them pretty but which might make it possible to
debug problems.

(Bitbake rev: a1a86f8c311cb1fc4f5562f1c77f82aa95141eee)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-12-08 17:17:32 +00:00
parent cc63d80b94
commit 8aa083f842
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/main.py
+7 -3
View File
@@ -17,6 +17,7 @@ import warnings
import fcntl import fcntl
import time import time
import traceback import traceback
import datetime
import bb import bb
from bb import event from bb import event
@@ -384,6 +385,9 @@ def bitbake_main(configParams, configuration):
return 1 return 1
def timestamp():
return datetime.datetime.now().strftime('%H:%M:%S.%f')
def setup_bitbake(configParams, extrafeatures=None): def setup_bitbake(configParams, extrafeatures=None):
# Ensure logging messages get sent to the UI as events # Ensure logging messages get sent to the UI as events
handler = bb.event.LogHandler() handler = bb.event.LogHandler()
@@ -434,7 +438,7 @@ def setup_bitbake(configParams, extrafeatures=None):
else: else:
logger.info("Reconnecting to bitbake server...") logger.info("Reconnecting to bitbake server...")
if not os.path.exists(sockname): if not os.path.exists(sockname):
logger.info("Previous bitbake instance shutting down?, waiting to retry...") logger.info("Previous bitbake instance shutting down?, waiting to retry... (%s)" % timestamp())
i = 0 i = 0
lock = None lock = None
# Wait for 5s or until we can get the lock # Wait for 5s or until we can get the lock
@@ -459,9 +463,9 @@ def setup_bitbake(configParams, extrafeatures=None):
retries -= 1 retries -= 1
tryno = 8 - retries tryno = 8 - retries
if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError, EOFError, SystemExit)): if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError, EOFError, SystemExit)):
logger.info("Retrying server connection (#%d)..." % tryno) logger.info("Retrying server connection (#%d)... (%s)" % (tryno, timestamp()))
else: else:
logger.info("Retrying server connection (#%d)... (%s)" % (tryno, traceback.format_exc())) logger.info("Retrying server connection (#%d)... (%s, %s)" % (tryno, traceback.format_exc(), timestamp()))
if not retries: if not retries:
bb.fatal("Unable to connect to bitbake server, or start one (server startup failures would be in bitbake-cookerdaemon.log).") bb.fatal("Unable to connect to bitbake server, or start one (server startup failures would be in bitbake-cookerdaemon.log).")