diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-10 18:33:36 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-10 18:33:36 +0000 |
| commit | bda25b999b5176c73380bff9a1ce6be51cba4820 (patch) | |
| tree | b37c841539f8544848fee2124572a0abe9a47953 /lib/pleroma/web/xml/xml.ex | |
| parent | 993c8c8bd4e94985c647f4f9e927cbaa7148e6a0 (diff) | |
| parent | ab98c92d86f91b0c83f482e002e4a518b93f65ca (diff) | |
| download | pleroma-bda25b999b5176c73380bff9a1ce6be51cba4820.tar.gz | |
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
Diffstat (limited to 'lib/pleroma/web/xml/xml.ex')
| -rw-r--r-- | lib/pleroma/web/xml/xml.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex index da3f68ecb..63d3302e0 100644 --- a/lib/pleroma/web/xml/xml.ex +++ b/lib/pleroma/web/xml/xml.ex @@ -28,12 +28,12 @@ defmodule Pleroma.Web.XML do |> :xmerl_scan.string() doc - catch - :exit, _error -> + rescue + _e -> Logger.debug("Couldn't parse XML: #{inspect(text)}") :error - rescue - e -> + catch + :exit, _error -> Logger.debug("Couldn't parse XML: #{inspect(text)}") :error end |