Skip to content

Commit 671623b

Browse files
author
Samuel Beaulieu
committed
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
1 parent e0fac0b commit 671623b

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

lib/vmfloaty/abs.rb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,20 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
284284

285285
validate_queue_status_response(res.status, res.body, "Initial request", verbose)
286286

287-
(1..retries).each do |i|
288-
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
289-
return translated(res_body, saved_job_id) if res_body
287+
begin
288+
(1..retries).each do |i|
289+
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
290+
return translated(res_body, saved_job_id) if res_body
290291

291-
sleep_seconds = 10 if i >= 10
292-
sleep_seconds = i if i < 10
293-
FloatyLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. Queue Position: #{queue_place}... (x#{i})"
292+
sleep_seconds = 10 if i >= 10
293+
sleep_seconds = i if i < 10
294+
FloatyLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. Queue Position: #{queue_place}... (x#{i})"
294295

295-
sleep(sleep_seconds)
296+
sleep(sleep_seconds)
297+
end
298+
rescue SystemExit, Interrupt
299+
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}`"
300+
exit 1
296301
end
297302
nil
298303
end

0 commit comments

Comments
 (0)