From df469b4468168cf072e73df73e0fdde2bbab1da5 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 11 Dec 2019 12:52:57 -0600
Subject: [PATCH 1/2] Benchmark env uses test database so we should be able to
use test.secret.exs
---
config/benchmark.exs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/config/benchmark.exs b/config/benchmark.exs
index dd99cf5fd..c7ddb80e7 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -82,3 +82,11 @@ config :pleroma, :database, rum_enabled: rum_enabled
IO.puts("RUM enabled: #{rum_enabled}")
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
+
+if File.exists?("./config/test.secret.exs") do
+ import_config "test.secret.exs"
+else
+ IO.puts(
+ "You may want to create test.secret.exs to declare custom database connection parameters."
+ )
+end
From b7811dfb7b612e0f6cf1d9f2451e381d525d965b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 19 Dec 2019 12:16:53 -0600
Subject: [PATCH 2/2] Instead allow a dedicated benchmark config
---
config/benchmark.exs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/benchmark.exs b/config/benchmark.exs
index c7ddb80e7..84c6782a2 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -83,10 +83,10 @@ IO.puts("RUM enabled: #{rum_enabled}")
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
-if File.exists?("./config/test.secret.exs") do
- import_config "test.secret.exs"
+if File.exists?("./config/benchmark.secret.exs") do
+ import_config "benchmark.secret.exs"
else
IO.puts(
- "You may want to create test.secret.exs to declare custom database connection parameters."
+ "You may want to create benchmark.secret.exs to declare custom database connection parameters."
)
end