OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
t#30487:fix export error
[pettanr/pettanr.git]
/
app
/
controllers
/
application_controller.rb
diff --git
a/app/controllers/application_controller.rb
b/app/controllers/application_controller.rb
index
3535232
..
c907a51
100644
(file)
--- a/
app/controllers/application_controller.rb
+++ b/
app/controllers/application_controller.rb
@@
-108,8
+108,13
@@
class ApplicationController < ActionController::Base
end
def export_from_provider url
- json = RestClient.get url
- JSON.parse json
+ res = nil
+ begin
+ json = RestClient.get url
+ res = JSON.parse json
+ rescue
+ end
+ res
end
def export_by action, provider_status, ymd