From 8a9e57cbf54852a694df120df54b85308f1f9408 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 24 Jan 2021 16:09:49 +0100 Subject: [PATCH] count-based error modified to be included in error 400, 404, 500 --- api.py | 71 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/api.py b/api.py index 49b27cb..a862e7a 100644 --- a/api.py +++ b/api.py @@ -189,9 +189,7 @@ def api_args(): api_phrase.append(random.choice(toChooseFrom[testKey])) api_phrase[0] = api_phrase[0].capitalize() api_phrase_str_word = ' '.join(api_phrase) - print('api_phrase_str_word: ',api_phrase_str_word) api_phrase_str = api_phrase_str + '\\n' + api_phrase_str_word - print('api_phrase_str: ',api_phrase_str) api_phrase_str_word = '' api_phrase_str = api_phrase_str[2:] @@ -239,10 +237,20 @@ def api_args(): refusal_message = build_error_two() org = 'someone' request_type = 'unknown request' - add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) - with counter.get_lock(): - counter.value += 1 - return jsonify(refusal_message) + out = counter.value + if out < 10: + with counter.get_lock(): + counter.value += 1 + out = counter.value + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) + else: + with counter.get_lock(): + counter.value = 0 + refusal_code = 402 + refusal_message = build_error_three() + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) @app.errorhandler(400) @@ -253,10 +261,19 @@ def error_fourzerozero(e): refusal_message = build_error_two() org = 'someone' request_type = 'unknown request' - add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) - with counter.get_lock(): - counter.value += 1 - return jsonify(refusal_message) + out = counter.value + if out < 10: + with counter.get_lock(): + counter.value += 1 + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) + else: + with counter.get_lock(): + counter.value = 0 + refusal_code = 402 + refusal_message = build_error_three() + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) @app.errorhandler(404) def error_fourzerofour(e): @@ -266,10 +283,19 @@ def error_fourzerofour(e): refusal_message = build_error_two() org = 'someone' request_type = 'unknown request' - add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) - with counter.get_lock(): - counter.value += 1 - return jsonify(refusal_message) + out = counter.value + if out < 10: + with counter.get_lock(): + counter.value += 1 + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) + else: + with counter.get_lock(): + counter.value = 0 + refusal_code = 402 + refusal_message = build_error_three() + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) @app.errorhandler(500) def error_fivezerozero(e): @@ -279,9 +305,18 @@ def error_fivezerozero(e): refusal_message = build_error_two() org = 'someone' request_type = 'unknown request' - add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message ) - with counter.get_lock(): - counter.value += 1 - return jsonify(refusal_message) + out = counter.value + if out < 10: + with counter.get_lock(): + counter.value += 1 + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) + else: + with counter.get_lock(): + counter.value = 0 + refusal_code = 402 + refusal_message = build_error_three() + add_error_db(timestamp,org,seedText,request_type,refusal_code,refusal_message) + return jsonify(refusal_message) # app.run()