openstack
/
openstack-helm-images
Code Issues Proposed changes

Fixed infinite loop in case post to primary_url is successful 

Change-Id: Id7bc76c8a638056e3f45daac831bd67a60e18287
This commit is contained in:
Alexey Odinokov 2024-03-12 12:44:25 -05:00 committed by Alexey
parent f2d87ed59e
commit e975536eb8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nagios/plugins/send_http_post_event.py
View File

@ -104,7 +104,7 @@ args = parser.parse_args()
payload = {} payload = {}
max_retry = 5 max_retry = 5
retry = 1 retry = 0
if args.type == 'host': if args.type == 'host':
payload['HostEvent'] = { payload['HostEvent'] = {
@ -126,22 +126,24 @@ elif args.type == 'service':
} }
while retry < max_retry: while retry < max_retry:
retry += 1
try: try:
requests.post( requests.post(
args.primary_url, args.primary_url,
data=json.dumps(payload), data=json.dumps(payload),
timeout=args.timeout, timeout=args.timeout,
verify=False) verify=False)
break
except Exception as e: except Exception as e:
if retry < max_retry: if retry < max_retry:
print('Request timeout, Retrying - {}'.format(retry)) print('Request timeout, Retrying - {}'.format(retry))
retry += 1
continue continue
pass pass
if args.secondary_url: if args.secondary_url:
retry = 1 retry = 0
while retry < max_retry: while retry < max_retry:
retry += 1
try: try:
requests.post( requests.post(
args.secondary_url, args.secondary_url,
@ -152,7 +154,6 @@ if args.secondary_url:
except Exception as e: except Exception as e:
if retry < max_retry: if retry < max_retry:
print('Request timeout, Retrying - {}'.format(retry)) print('Request timeout, Retrying - {}'.format(retry))
retry += 1
continue continue
pass pass