diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-11 19:31:57 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-11 19:31:57 +0300 |
| commit | 5992382cf86d89879b7a8e2dcbf26e910634a73a (patch) | |
| tree | 56962d73ef162757190a5e1bfa37f1ba110d9907 /lib/pleroma/application.ex | |
| parent | a996ab46a54acbfa7a19da3eae12c78ed6466a1a (diff) | |
| parent | 2cf753c5022dd7178d882e36e25b3a40dc403eff (diff) | |
| download | pleroma-5992382cf86d89879b7a8e2dcbf26e910634a73a.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index d39451a9d..9ca048a5f 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Application do @name Mix.Project.config()[:name] @version Mix.Project.config()[:version] @repository Mix.Project.config()[:source_url] - @env Mix.env() + @mix_env Mix.env() def name, do: @name def version, do: @version @@ -92,15 +92,15 @@ defmodule Pleroma.Application do Pleroma.Web.Plugs.RateLimiter.Supervisor ] ++ cachex_children() ++ - http_children(adapter, @env) ++ + http_children(adapter, @mix_env) ++ [ Pleroma.Stats, Pleroma.JobQueueMonitor, {Majic.Pool, [name: Pleroma.MajicPool, pool_size: Config.get([:majic_pool, :size], 2)]}, {Oban, Config.get(Oban)} ] ++ - task_children(@env) ++ - dont_run_in_test(@env) ++ + task_children(@mix_env) ++ + dont_run_in_test(@mix_env) ++ chat_child(chat_enabled?()) ++ [ Pleroma.Web.Endpoint, @@ -146,7 +146,7 @@ defmodule Pleroma.Application do raise "Invalid custom modules" {:ok, modules, _warnings} -> - if @env != :test do + if @mix_env != :test do Enum.each(modules, fn mod -> Logger.info("Custom module loaded: #{inspect(mod)}") end) |