Merge branch 'master' into bump_version_to_0.9.0

This commit is contained in:
Brian Cain 2019-12-17 09:45:47 -08:00 committed by GitHub
commit dac2c2bae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 4 deletions

View file

@ -57,11 +57,19 @@ class ABS
requests = JSON.parse(res.body)
ret_val = []
requests.each do |req|
req_hash = JSON.parse(req)
next unless user == req_hash['request']['job']['user']
ret_val.push(req_hash)
requests.each do |req|
next if req == 'null'
req_hash = JSON.parse(req)
begin
next unless user == req_hash['request']['job']['user']
ret_val.push(req_hash)
rescue NoMethodError
puts "Warning: couldn't parse line returned from abs/status/queue: ".yellow
end
end
ret_val