diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 11:58:38 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 11:58:38 +0300 |
| commit | 650853fc895fb2e21eac347e056eab98b842a3b7 (patch) | |
| tree | 7df844177fb8aa12057c6a0693b2bd04ca17807a /benchmarks | |
| parent | 99b0bc198921099816a5f809f11a7579b3993274 (diff) | |
| parent | 60cc7d6c9a2ec60c3a98f0fe51d68d3dbd5d21c2 (diff) | |
| download | pleroma-650853fc895fb2e21eac347e056eab98b842a3b7.tar.gz pleroma-650853fc895fb2e21eac347e056eab98b842a3b7.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/load_testing/fetcher.ex | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/benchmarks/load_testing/fetcher.ex b/benchmarks/load_testing/fetcher.ex index bd65ac84f..786929ace 100644 --- a/benchmarks/load_testing/fetcher.ex +++ b/benchmarks/load_testing/fetcher.ex @@ -386,47 +386,56 @@ defmodule Pleroma.LoadTesting.Fetcher do favourites = ActivityPub.fetch_favourites(user) + output_relationships = + !!Pleroma.Config.get([:extensions, :output_relationships_in_statuses_by_default]) + Benchee.run( %{ "Rendering home timeline" => fn -> StatusView.render("index.json", %{ activities: home_activities, for: user, - as: :activity + as: :activity, + skip_relationships: !output_relationships }) end, "Rendering direct timeline" => fn -> StatusView.render("index.json", %{ activities: direct_activities, for: user, - as: :activity + as: :activity, + skip_relationships: !output_relationships }) end, "Rendering public timeline" => fn -> StatusView.render("index.json", %{ activities: public_activities, for: user, - as: :activity + as: :activity, + skip_relationships: !output_relationships }) end, "Rendering tag timeline" => fn -> StatusView.render("index.json", %{ activities: tag_activities, for: user, - as: :activity + as: :activity, + skip_relationships: !output_relationships }) end, "Rendering notifications" => fn -> Pleroma.Web.MastodonAPI.NotificationView.render("index.json", %{ notifications: notifications, - for: user + for: user, + skip_relationships: !output_relationships }) end, "Rendering favourites timeline" => fn -> StatusView.render("index.json", %{ activities: favourites, for: user, - as: :activity + as: :activity, + skip_relationships: !output_relationships }) end }, |