projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index 73364f1411da2cf08227772b9cfc0fb44f3a2166..2c8889ce58886fa502c04af9248aca4c42817219 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.Application do
import Cachex.Spec
use Application
defmodule Pleroma.Application do
import Cachex.Spec
use Application
+ require Logger
@name Mix.Project.config()[:name]
@version Mix.Project.config()[:version]
@name Mix.Project.config()[:name]
@version Mix.Project.config()[:version]
@@
-30,7
+31,10
@@
defmodule Pleroma.Application do
# See http://elixir-lang.org/docs/stable/elixir/Application.html
# for more information on OTP Applications
def start(_type, _args) do
# See http://elixir-lang.org/docs/stable/elixir/Application.html
# for more information on OTP Applications
def start(_type, _args) do
+ Pleroma.HTML.compile_scrubbers()
Pleroma.Config.DeprecationWarnings.warn()
Pleroma.Config.DeprecationWarnings.warn()
+ Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled()
+ Pleroma.Repo.check_migrations_applied!()
setup_instrumenters()
load_custom_modules()
setup_instrumenters()
load_custom_modules()
@@
-69,22
+73,21
@@
defmodule Pleroma.Application do
end
def load_custom_modules do
end
def load_custom_modules do
- dir = Pleroma.Config.get([:
instance, :custom_modules
_dir])
+ dir = Pleroma.Config.get([:
modules, :runtime
_dir])
if dir && File.exists?(dir) do
dir
if dir && File.exists?(dir) do
dir
- |> File.ls!()
- |> Enum.map(&Path.join(dir, &1))
- |> Kernel.ParallelCompiler.compile()
+ |> Pleroma.Utils.compile_dir()
|> case do
{:error, _errors, _warnings} ->
raise "Invalid custom modules"
{:ok, modules, _warnings} ->
|> case do
{:error, _errors, _warnings} ->
raise "Invalid custom modules"
{:ok, modules, _warnings} ->
- Enum.each(modules, fn mod ->
- name = mod |> Atom.to_string() |> String.trim_leading("Elixir.")
- IO.puts("Custom module loaded: #{name}")
- end)
+ if @env != :test do
+ Enum.each(modules, fn mod ->
+ Logger.info("Custom module loaded: #{inspect(mod)}")
+ end)
+ end
:ok
end
:ok
end
@@
-171,8
+174,6
@@
defmodule Pleroma.Application do
defp oauth_cleanup_child(_), do: []
defp oauth_cleanup_child(_), do: []
- defp chat_child(:test, _), do: []
-
defp chat_child(_env, true) do
[Pleroma.Web.ChatChannel.ChatChannelState]
end
defp chat_child(_env, true) do
[Pleroma.Web.ChatChannel.ChatChannelState]
end