diff options
| -rw-r--r-- | meta/classes/report-error.bbclass | 106 | ||||
| -rw-r--r-- | meta/conf/local.conf.sample.extended | 21 |
2 files changed, 124 insertions, 3 deletions
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 8b30422edf..ff2c98e5d8 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -7,6 +7,12 @@ # Licensed under the MIT license, see COPYING.MIT for details ERR_REPORT_DIR ?= "${LOG_DIR}/error-report" +ERR_REPORT_PORT ?= "80" + +ERR_REPORT_UPLOAD_FAILURES[type] = "boolean" +ERR_REPORT_UPLOAD_FAILURES ?= "0" +ERR_REPORT_UPLOAD_ALL[type] = "boolean" +ERR_REPORT_UPLOAD_ALL ?= "0" def errorreport_getdata(e): logpath = e.data.getVar('ERR_REPORT_DIR', True) @@ -24,6 +30,92 @@ def errorreport_savedata(e, newdata, file): json.dump(newdata, f, indent=4, sort_keys=True) return datafile +def errorreport_get_user_info(e): + """ + Read user info from variables or from git config + """ + import subprocess + username = e.data.getVar('ERR_REPORT_USERNAME', True) + email = e.data.getVar('ERR_REPORT_EMAIL', True) + if not username or email: + # try to read them from git config + username = subprocess.check_output(['git', 'config', '--get', 'user.name']).strip() + email = subprocess.check_output(['git', 'config', '--get', 'user.email']).strip() + return (username, email) + +def errorreport_get_submit_info(e): + """ + Read submit info from ~/.oe-send-error or ask interactively and save it there. + """ + home = os.path.expanduser("~") + userfile = os.path.join(home, ".oe-send-error") + if os.path.isfile(userfile): + with open(userfile) as g: + username = g.readline() + email = g.readline() + else: + print("Please enter your name and your email (optionally), they'll be saved in the file you send.") + username = raw_input("Name: ") + email = raw_input("E-mail (not required): ") + server = raw_input("Server: ") + port = raw_input("Port: ") + if len(username) > 0 and len(username) < 50: + with open(userfile, "w") as g: + g.write(username + "\n") + g.write(email + "\n") + g.write(server + "\n") + g.write(port + "\n") + else: + print("Invalid inputs, try again.") + return errorreport_get_submit_info() + return (username, email, server, port) + +def errorreport_senddata(e, json_file): + """ + From scripts/send-error-report to automate report submissions. + """ + + import httplib, urllib, os, sys, json, subprocess + + if os.path.isfile(json_file): + server = e.data.getVar('ERR_REPORT_SERVER', True) + port = e.data.getVar('ERR_REPORT_PORT', True) + bb.note("Uploading the report %s to %s:%s" % (json_file, server, port)) + + with open(json_file) as f: + data = f.read() + + try: + jsondata = json.loads(data) + if not jsondata['username'] or not server: + (username, email, server, port) = errorreport_get_submit_info(e) + jsondata['username'] = username.strip() + jsondata['email'] = email.strip() + data = json.dumps(jsondata, indent=4, sort_keys=True) + except: + bb.error("Invalid json data") + return + + try: + params = urllib.urlencode({'data': data}) + headers = {"Content-type": "application/json"} + conn = httplib.HTTPConnection(server, port) + conn.request("POST", "/ClientPost/", params, headers) + response = conn.getresponse() + res = response.read() + if response.status == 200: + bb.note(res) + else: + bb.warn("There was a problem submiting your data, response written in %s.response.html" % json_file) + with open("%s.response.html" % json_file, "w") as f: + f.write(res) + conn.close() + except: + bb.warn("Server connection failed") + + else: + bb.warn("No data file found.") + python errorreport_handler () { import json @@ -38,6 +130,9 @@ python errorreport_handler () { data['failures'] = [] data['component'] = e.getPkgs()[0] data['branch_commit'] = base_detect_branch(e.data) + ": " + base_detect_revision(e.data) + (username, email) = errorreport_get_user_info(e) + data['username'] = username.strip() + data['email'] = email.strip() errorreport_savedata(e, data, "error-report.txt") elif isinstance(e, bb.build.TaskFailed): @@ -58,12 +153,17 @@ python errorreport_handler () { elif isinstance(e, bb.event.BuildCompleted): jsondata = json.loads(errorreport_getdata(e)) + upload_failures = oe.data.typed_value('ERR_REPORT_UPLOAD_FAILURES', e.data) + upload_all = oe.data.typed_value('ERR_REPORT_UPLOAD_ALL', e.data) failures = jsondata['failures'] - if(len(failures) > 0): + if failures or upload_all: filename = "error_report_" + e.data.getVar("BUILDNAME")+".txt" datafile = errorreport_savedata(e, jsondata, filename) - bb.note("The errors for this build are stored in %s\nYou can send the errors to an upstream server by running:\n send-error-report %s [server]" % (datafile, datafile)) - bb.note("The contents of these logs will be posted in public if you use the above command with the default server. If you need to do so, please ensure you remove any identifying or proprietary information before sending.") + if upload_all or (failures and upload_failures): + errorreport_senddata(e, datafile) + else: + bb.note("The errors for this build are stored in %s\nYou can send the errors to an upstream server by running:\n send-error-report %s [server]" % (datafile, datafile)) + bb.note("The contents of these logs will be posted in public if you use the above command with the default server. If you need to do so, please ensure you remove any identifying or proprietary information before sending.") } addhandler errorreport_handler diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index 1995732619..d91e6f1249 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -372,3 +372,24 @@ # PREFERRED_VERSION_rpm = "4.11.2" # PREFERRED_VERSION_rpm-native = "4.11.2" # RPMROOTFSDEPENDS_remove = "rpmresolve-native:do_populate_sysroot" + +# +# Uploading reports with report-error.bbclass +# +# Allow to automatically upload the reports without developer calling extra script to upload them. +# +# ERR_REPORT_SERVER = "errors.test.ltd" +# ERR_REPORT_PORT = "8000" +# +# Username if you don't want to use "git config --get user.name" +# ERR_REPORT_USERNAME = "Tester" +# E-mail if you don't want to use "git config --get user.email" +# ERR_REPORT_EMAIL = "tester@test.ltd" +# +# Upload reports from failed builds +# ERR_REPORT_UPLOAD_FAILURES = "1" +# +# Upload reports from all builds, not only those with failures +# ERR_REPORT_UPLOAD_ALL = "1" +# +# INHERIT += "report-error" |