summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-12 08:50:11 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-12 10:48:27 +1200
commit9d6e8390ed36109fa92e4a9988a923e236b9aaea (patch)
tree89c78820fdc3a768ad8a8400679e6902dc9c68c9
parent6e46d92224a7a4d668d507a9bf73cdb7206ba80c (diff)
downloadbitbake-contrib-paule/bb-fixes.zip
bitbake-contrib-paule/bb-fixes.tar.gz
bitbake-contrib-paule/bb-fixes.tar.bz2
server/process: ensure server failure log is limited to current sessionpaule/bb-fixes
Printing the last 10 lines of bitbake-cookerdaemon.log when the server fails to start can sometimes result in printing the output from a previous run, which could lead the user completely down the wrong path in terms of the cause of the failure. Use a known start text containing the time which we can then look for when scanning through the log, and then grab the last 10 lines of that part instead. Fixes [YOCTO #11903]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--lib/bb/server/process.py28
1 files changed, 25 insertions, 3 deletions
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 5c7dfae..e64194d 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -33,6 +33,8 @@ import select
import socket
import subprocess
import errno
+import re
+import datetime
import bb.server.xmlrpcserver
from bb import daemonize
from multiprocessing import queues
@@ -358,6 +360,9 @@ class BitBakeProcessServerConnection(object):
return
class BitBakeServer(object):
+ start_log_format = '--- Starting bitbake server pid %s at %s ---'
+ start_log_datetime_format = '%Y-%m-%d %H:%M:%S.%f'
+
def __init__(self, lock, sockname, configuration, featureset):
self.configuration = configuration
@@ -383,6 +388,7 @@ class BitBakeServer(object):
self.sock.listen(1)
os.set_inheritable(self.sock.fileno(), True)
+ startdatetime = datetime.datetime.now()
bb.daemonize.createDaemon(self._startServer, logfile)
self.sock.close()
self.bitbake_lock.close()
@@ -393,15 +399,31 @@ class BitBakeServer(object):
ready.close()
bb.error("Unable to start bitbake server")
if os.path.exists(logfile):
+ logstart_re = re.compile(self.start_log_format % ('([0-9]+)', '([0-9-]+ [0-9:.]+)'))
+ started = False
+ lines = []
with open(logfile, "r") as f:
- logs=f.readlines()
- bb.error("Last 10 lines of server log %s:\n%s" % (logfile, "".join(logs[-10:])))
+ for line in f:
+ if started:
+ lines.append(line)
+ else:
+ res = logstart_re.match(line.rstrip())
+ if res:
+ ldatetime = datetime.datetime.strptime(res.group(2), self.start_log_datetime_format)
+ if ldatetime >= startdatetime:
+ started = True
+ lines.append(line)
+ if lines:
+ if len(lines) > 10:
+ bb.error("Last 10 lines of server log for this session (%s):\n%s" % (logfile, "".join(lines[-10:])))
+ else:
+ bb.error("Server log for this session (%s):\n%s" % (logfile, "".join(lines)))
raise SystemExit(1)
ready.close()
os.close(self.readypipein)
def _startServer(self):
- print("Starting bitbake server pid %d" % os.getpid())
+ print(self.start_log_format % (os.getpid(), datetime.datetime.now().strftime(self.start_log_datetime_format)))
server = ProcessServer(self.bitbake_lock, self.sock, self.sockname)
self.configuration.setServerRegIdleCallback(server.register_idle_function)