[OE-core] [PATCH 1/1] send-error-report: Add --no-ssl to use http protocol
Robert Yang
liezhi.yang at windriver.com
Mon Mar 4 10:49:00 UTC 2019
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.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
scripts/send-error-report | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/scripts/send-error-report b/scripts/send-error-report
index 3528cf9..f8039b8 100755
--- a/scripts/send-error-report
+++ b/scripts/send-error-report
@@ -60,9 +60,9 @@ def edit_content(json_file_path):
return True
return False
-def prepare_data(args):
+def prepare_data(args, protocol):
# 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(protocol+args.server+"/ClientPost/JSON")
if not os.path.isfile(args.error_file):
log.error("No data file found.")
@@ -128,13 +128,13 @@ def prepare_data(args):
return data.encode('utf-8')
-def send_data(data, args):
+def send_data(data, args, protocol):
headers={'Content-type': 'application/json', 'User-Agent': "send-error-report/"+version}
if args.json:
- url = "https://"+args.server+"/ClientPost/JSON/"
+ url = protocol+args.server+"/ClientPost/JSON/"
else:
- url = "https://"+args.server+"/ClientPost/"
+ url = protocol+args.server+"/ClientPost/"
req = urllib.request.Request(url, data=data, headers=headers)
try:
@@ -187,6 +187,10 @@ 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",
+ action="store_true")
+
args = arg_parse.parse_args()
@@ -194,7 +198,12 @@ if __name__ == '__main__':
if (args.json == False):
print("Preparing to send errors to: "+args.server)
- data = prepare_data(args)
- send_data(data, args)
+ if args.no_ssl:
+ protocol = "http://"
+ else:
+ protocol = "https://"
+
+ data = prepare_data(args, protocol)
+ send_data(data, args, protocol)
sys.exit(0)
--
2.7.4
More information about the Openembedded-core
mailing list