From 0caa35c1f9fbc97a751d1019d7b00e683cc6e084 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Fri, 11 Nov 2022 21:19:56 +0100 Subject: [PATCH] Apparently, the segfaults were not jemalloc's fault. --- dist/mastodon-sidekiq.service | 2 +- dist/mastodon-streaming.service | 1 + dist/mastodon-web.service | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/mastodon-sidekiq.service b/dist/mastodon-sidekiq.service index 5150121960..3f4c806048 100644 --- a/dist/mastodon-sidekiq.service +++ b/dist/mastodon-sidekiq.service @@ -9,7 +9,7 @@ WorkingDirectory=/home/mastodon/live Environment="RAILS_ENV=production" Environment="DB_POOL=25" Environment="MALLOC_ARENA_MAX=2" -Environment="LD_PRELOAD=libmimalloc.so" +Environment="LD_PRELOAD=libjemalloc.so" ExecStart=/home/mastodon/.rbenv/shims/bundle exec sidekiq -c 25 TimeoutSec=15 Restart=always diff --git a/dist/mastodon-streaming.service b/dist/mastodon-streaming.service index cf1f2d8bc6..fdd280d8e1 100644 --- a/dist/mastodon-streaming.service +++ b/dist/mastodon-streaming.service @@ -9,6 +9,7 @@ WorkingDirectory=/home/mastodon/live Environment="NODE_ENV=production" Environment="PORT=4000" Environment="STREAMING_CLUSTER_NUM=1" +Environment="LD_PRELOAD=libjemalloc.so" ExecStart=/usr/bin/node ./streaming TimeoutSec=15 Restart=always diff --git a/dist/mastodon-web.service b/dist/mastodon-web.service index bc96c0accb..a5598fdaa8 100644 --- a/dist/mastodon-web.service +++ b/dist/mastodon-web.service @@ -8,7 +8,7 @@ User=mastodon WorkingDirectory=/home/mastodon/live Environment="RAILS_ENV=production" Environment="PORT=3000" -Environment="LD_PRELOAD=libmimalloc.so" +Environment="LD_PRELOAD=libjemalloc.so" ExecStart=/home/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb ExecReload=/bin/kill -SIGUSR1 $MAINPID TimeoutSec=15