handle ctrl-c and term signal and return useful message on how

to query ABS for the state of the request or to delete it
This commit is contained in:
Samuel Beaulieu 2020-10-09 10:37:16 -05:00
parent e0fac0bb6c
commit 671623bc4f

View file

@ -284,15 +284,20 @@ class ABS
validate_queue_status_response(res.status, res.body, "Initial request", verbose) validate_queue_status_response(res.status, res.body, "Initial request", verbose)
(1..retries).each do |i| begin
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose) (1..retries).each do |i|
return translated(res_body, saved_job_id) if res_body queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
return translated(res_body, saved_job_id) if res_body
sleep_seconds = 10 if i >= 10 sleep_seconds = 10 if i >= 10
sleep_seconds = i if i < 10 sleep_seconds = i if i < 10
FloatyLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. Queue Position: #{queue_place}... (x#{i})" FloatyLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. Queue Position: #{queue_place}... (x#{i})"
sleep(sleep_seconds) sleep(sleep_seconds)
end
rescue SystemExit, Interrupt
FloatyLogger.info "\n\nFloaty interrupted, you can query the state of your request via\n1) `floaty query #{saved_job_id}` or delete it via\n2) `floaty delete #{saved_job_id}`"
exit 1
end end
nil nil
end end