FallbackRedirector: Do not crash on Metadata rendering errors

This commit is contained in:
rinpatch 2019-07-08 12:59:49 +03:00
parent 7f609ee8f4
commit 9e58d3c624
2 changed files with 17 additions and 2 deletions

View File

@ -11,7 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Admin API: Return avatar and display name when querying users
### Fixed
- Not being able to pin unlisted posts
- Not being able to pin unlisted postss
- Metadata rendering crashes no longer result in 500 errors
- Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`)
### Changed

View File

@ -724,6 +724,7 @@ defmodule Pleroma.Web.Router do
defmodule Fallback.RedirectController do
use Pleroma.Web, :controller
require Logger
alias Pleroma.User
alias Pleroma.Web.Metadata
@ -750,7 +751,20 @@ def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id}
def redirector_with_meta(conn, params) do
{:ok, index_content} = File.read(index_file_path())
tags = Metadata.build_tags(params)
tags =
try do
Metadata.build_tags(params)
rescue
e ->
Logger.error(
"Metadata rendering for #{conn.request_path} failed.\n" <>
Exception.format(:error, e, __STACKTRACE__)
)
""
end
response = String.replace(index_content, "<!--server-generated-meta-->", tags)
conn