From f991dc03290bd7442675350195ec034c44968694 Mon Sep 17 00:00:00 2001 From: sn0w Date: Thu, 7 Jun 2018 12:37:17 +0200 Subject: [PATCH] Add configurable loglevel --- .env.dist | 4 ++++ docker-compose.m4 | 1 + docker-config.exs | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.env.dist b/.env.dist index 63a5121..a7f645f 100644 --- a/.env.dist +++ b/.env.dist @@ -61,6 +61,10 @@ MIX_ENV=prod # The git tag, revision, or branch to check out on build PLEROMA_VERSION=develop +# The loglevel to use +# (error/warn/info/debug) +PLEROMA_LOGLEVEL=warn + # The domain/scheme where pleroma will be hosted # URL is a bare TLD # SCHEME is the protocol without "://" diff --git a/docker-compose.m4 b/docker-compose.m4 index f900403..17548be 100644 --- a/docker-compose.m4 +++ b/docker-compose.m4 @@ -101,6 +101,7 @@ define(, <${upcase($1):-$2}>) "env()", "env()", + "env()", "env()", "env()", "env()", diff --git a/docker-config.exs b/docker-config.exs index 114dbc2..6970e52 100644 --- a/docker-config.exs +++ b/docker-config.exs @@ -14,6 +14,8 @@ defmodule Docker do end end +config :logger, level: String.to_atom(Docker.env(:loglevel) || "info") + config :pleroma, Pleroma.Web.Endpoint, url: [ host: Docker.env(:url),