From 3544b4d4d72330eb12bb3cda25cb99ed52c8a2eb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 4 Sep 2015 14:22:09 +0200 Subject: report-error: send only last 5242000 characters in error logs * otherwise whole build report submission is rejected because it's too big Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/report-error.bbclass | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index cabd98cc32..040c29ea24 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -54,13 +54,22 @@ python errorreport_handler () { if log: try: logFile = open(log, 'r') - taskdata['log'] = logFile.read().decode('utf-8') + logdata = logFile.read().decode('utf-8') logFile.close() except: - taskdata['log'] = "Unable to read log file" + logdata = "Unable to read log file" else: - taskdata['log'] = "No Log" + logdata = "No Log" + + # server will refuse failures longer than param specified in project.settings.py + # MAX_UPLOAD_SIZE = "5242880" + # use lower value, because 650 chars can be spent in task, package, version + max_logdata_size = 5242000 + # upload last max_logdata_size characters + if len(logdata) > max_logdata_size: + logdata = "..." + logdata[-max_logdata_size:] + taskdata['log'] = logdata lock = bb.utils.lockfile(datafile + '.lock') jsondata = json.loads(errorreport_getdata(e)) jsondata['failures'].append(taskdata) -- cgit 1.2.3-korg