From 10a3897f92ee058155987cea23eec28b28377d4b Mon Sep 17 00:00:00 2001 From: Alejandro Sirgo Rica Date: Thu, 21 Nov 2024 16:46:18 +0100 Subject: cli: ensure the program returns 0 on success and 1 on error propagate a returncode in each operation and make it the returncode of the program. Prevent sys.exit calls in post(), get() and delete() request handlers to enable cleanup code and error handling. Keep a basic error log inside the request functions if the connection can't be established or if the response contains an error code. --- cli/objects/scopes.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cli/objects/scopes.py') diff --git a/cli/objects/scopes.py b/cli/objects/scopes.py index bfa3f94..88f5521 100644 --- a/cli/objects/scopes.py +++ b/cli/objects/scopes.py @@ -57,8 +57,8 @@ class OgScope(): for ip in parsed_args.client_ip: ips.add(ip) - r = rest.get('/scopes') - json_data = json.loads(r.text) + res = rest.get('/scopes') + json_data = json.loads(res.text) if parsed_args.name: path = _get_client_path(json_data, None, parsed_args.name) @@ -71,8 +71,7 @@ class OgScope(): path = _get_client_path(json_data, client_ip, None) for i, item in enumerate(path): print(' ' * i + item) - return None else: - print_json(r.text) - return None + print_json(res.text) + return 0 -- cgit v1.2.3-18-g5258