From f9dac6e62623b0ac1a2b2f40b54337721afab7a5 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 5 Mar 2019 11:30:35 +0800 Subject: send-error-report: Add --no-ssl to use http protocol The script use https protocol by default, but the error-report-web server's https connection may not work (e.g., doesn't work with python 2.7.6), so add an option --no-ssl to make it use http. (From OE-Core rev: a4c89902a24c0961657c8281425d480097aadfa6) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- scripts/send-error-report | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/send-error-report b/scripts/send-error-report index 3528cf93a9..0ed7cc905e 100755 --- a/scripts/send-error-report +++ b/scripts/send-error-report @@ -62,7 +62,7 @@ def edit_content(json_file_path): def prepare_data(args): # attempt to get the max_log_size from the server's settings - max_log_size = getPayloadLimit("https://"+args.server+"/ClientPost/JSON") + max_log_size = getPayloadLimit(args.protocol+args.server+"/ClientPost/JSON") if not os.path.isfile(args.error_file): log.error("No data file found.") @@ -132,9 +132,9 @@ def send_data(data, args): headers={'Content-type': 'application/json', 'User-Agent': "send-error-report/"+version} if args.json: - url = "https://"+args.server+"/ClientPost/JSON/" + url = args.protocol+args.server+"/ClientPost/JSON/" else: - url = "https://"+args.server+"/ClientPost/" + url = args.protocol+args.server+"/ClientPost/" req = urllib.request.Request(url, data=data, headers=headers) try: @@ -187,6 +187,11 @@ if __name__ == '__main__': help="Return the result in json format, silences all other output", action="store_true") + arg_parse.add_argument("--no-ssl", + help="Use http instead of https protocol", + dest="protocol", + action="store_const", const="http://", default="https://") + args = arg_parse.parse_args() -- cgit 1.2.3-korg