aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-29 16:28:53 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-29 16:28:53 +0000
commitce6dfb6f066616553d8594fd6ffadcc96ad1daff (patch)
treeb7b4022f45fd01233bf76138d5222b81f16e8ad4 /lib/pleroma/web/router.ex
parent5cb37412a21420509f61027fe486ae66242f800a (diff)
parentd9aacbec4d8e787ff9f62427a120d28366463a7f (diff)
downloadpleroma-1.0.2.tar.gz
Merge branch 'release/1.0.2' into 'master'v1.0.2
1.0.2 release See merge request pleroma/pleroma!1499
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 055289dc5..ff9ed1640 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -724,6 +724,7 @@ end
defmodule Fallback.RedirectController do
use Pleroma.Web, :controller
+ require Logger
alias Pleroma.User
alias Pleroma.Web.Metadata
@@ -750,7 +751,20 @@ defmodule Fallback.RedirectController do
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