Fix mistake in pet loading error handling
Oops, warning isn't enough, we also need to stop, right lol! I moved this into a method, so we could `return` out of there.
This commit is contained in:
parent
f7fdf4e44c
commit
c93895b2f7
1 changed files with 5 additions and 1 deletions
|
@ -25,6 +25,8 @@ class PetType < ApplicationRecord
|
||||||
where(color_id: color.id, species_id: species.id)
|
where(color_id: color.id, species_id: species.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
before_save :load_image_hash
|
||||||
|
|
||||||
def self.special_color_or_basic(special_color)
|
def self.special_color_or_basic(special_color)
|
||||||
color_ids = special_color ? [special_color.id] : Color.basic.select([:id]).map(&:id)
|
color_ids = special_color ? [special_color.id] : Color.basic.select([:id]).map(&:id)
|
||||||
where(color_id: color_ids)
|
where(color_id: color_ids)
|
||||||
|
@ -121,7 +123,7 @@ class PetType < ApplicationRecord
|
||||||
pet_state
|
pet_state
|
||||||
end
|
end
|
||||||
|
|
||||||
before_save do
|
def load_image_hash
|
||||||
if @origin_pet && @origin_pet.name =~ IMAGE_CPN_ACCEPTABLE_NAME
|
if @origin_pet && @origin_pet.name =~ IMAGE_CPN_ACCEPTABLE_NAME
|
||||||
cpn_uri = URI.parse sprintf(IMAGE_CPN_FORMAT, CGI.escape(@origin_pet.name))
|
cpn_uri = URI.parse sprintf(IMAGE_CPN_FORMAT, CGI.escape(@origin_pet.name))
|
||||||
begin
|
begin
|
||||||
|
@ -136,8 +138,10 @@ class PetType < ApplicationRecord
|
||||||
res.error!
|
res.error!
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
Rails.logger.warn "Error loading CPN image at #{cpn_uri}: #{e.message}"
|
Rails.logger.warn "Error loading CPN image at #{cpn_uri}: #{e.message}"
|
||||||
|
return
|
||||||
else
|
else
|
||||||
Rails.logger.warn "Error loading CPN image at #{cpn_uri}. Response: #{res.inspect}"
|
Rails.logger.warn "Error loading CPN image at #{cpn_uri}. Response: #{res.inspect}"
|
||||||
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
new_url = res['location']
|
new_url = res['location']
|
||||||
|
|
Loading…
Reference in a new issue