summaryrefslogtreecommitdiff
path: root/benchmarks/mix/tasks
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-04-28 19:56:20 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-04-28 19:56:20 +0300
commit908cf22a6cb07044eb0fb44c9673c8adcf22c0db (patch)
treeb522172092989cb1d1312f846974ff55493fbee9 /benchmarks/mix/tasks
parentb4139cc5472079a34f0256ac9991a0222844d44c (diff)
parent699fc9569fa06278baaec6804348375cb9891185 (diff)
downloadpleroma-908cf22a6cb07044eb0fb44c9673c8adcf22c0db.tar.gz
pleroma-908cf22a6cb07044eb0fb44c9673c8adcf22c0db.zip
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Diffstat (limited to 'benchmarks/mix/tasks')
-rw-r--r--benchmarks/mix/tasks/pleroma/load_testing.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/benchmarks/mix/tasks/pleroma/load_testing.ex b/benchmarks/mix/tasks/pleroma/load_testing.ex
index 72b225f09..388883240 100644
--- a/benchmarks/mix/tasks/pleroma/load_testing.ex
+++ b/benchmarks/mix/tasks/pleroma/load_testing.ex
@@ -44,6 +44,7 @@ defmodule Mix.Tasks.Pleroma.LoadTesting do
]
def run(args) do
+ Logger.configure(level: :error)
Mix.Pleroma.start_pleroma()
clean_tables()
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)