projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
web.ex
diff --git
a/lib/pleroma/web/web.ex
b/lib/pleroma/web/web.ex
index 66813e4ddaffa5ad1fd4f807047e639c86a29cc0..cf3ac1287b364bf9552cc970bf47da6eead76b7d 100644
(file)
--- a/
lib/pleroma/web/web.ex
+++ b/
lib/pleroma/web/web.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web do
@@
-23,9
+23,11
@@
defmodule Pleroma.Web do
def controller do
quote do
use Phoenix.Controller, namespace: Pleroma.Web
def controller do
quote do
use Phoenix.Controller, namespace: Pleroma.Web
+
import Plug.Conn
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
import Plug.Conn
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
+ import Pleroma.Web.TranslationHelpers
plug(:set_put_layout)
plug(:set_put_layout)
@@
-56,10
+58,10
@@
defmodule Pleroma.Web do
rescue
error ->
Logger.error(
rescue
error ->
Logger.error(
- "#{__MODULE__} failed to render #{inspect({view, template})}: #{inspect(error)}"
+ "#{__MODULE__} failed to render #{inspect({view, template})}\n" <>
+ Exception.format(:error, error, __STACKTRACE__)
)
)
- Logger.error(inspect(__STACKTRACE__))
nil
end
nil
end