diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-06 14:46:34 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-06 14:47:38 +0200 |
| commit | 5cfc9efad3a26730f65b389511fa845ccad7857e (patch) | |
| tree | e7e5e91d1c512b4e78f783f26645c642ea3e18b4 | |
| parent | 2f5b205916c3204e6e4908e371b29718b7e9e730 (diff) | |
Update OStatus2 to handle malformed Salmon without raising unexpected exceptions
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | app/services/process_interaction_service.rb | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 82e3bdaf4..8e33e85ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,12 +166,11 @@ GEM minitest (5.9.0) multi_json (1.12.1) nio4r (1.2.1) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) oj (2.17.3) orm_adapter (0.5.0) - ostatus2 (0.3.1) + ostatus2 (0.3.2) addressable (~> 2.4) http (~> 2.0) nokogiri (~> 1.6) @@ -187,7 +186,6 @@ GEM parser (2.3.1.2) ast (~> 2.2) pg (0.18.4) - pkg-config (1.1.7) powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb index 31c7c46a5..0768579ef 100644 --- a/app/services/process_interaction_service.rb +++ b/app/services/process_interaction_service.rb @@ -35,7 +35,7 @@ class ProcessInteractionService < BaseService delete_post!(xml, account) end end - rescue Goldfinger::Error, HTTP::Error + rescue Goldfinger::Error, HTTP::Error, OStatus2::BadSalmonError nil end |