From b3374e1f99b8dcbc1b67d4dce24a50204f78110b Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 14 Apr 2021 18:25:39 +0200 Subject: [PATCH] Remove SMP option from ejabberdctl.cfg, -smp was removed in OTP 21 (#3560) --- ejabberdctl.cfg.example | 14 -------------- ejabberdctl.template | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/ejabberdctl.cfg.example b/ejabberdctl.cfg.example index e88b32835..2300378e0 100644 --- a/ejabberdctl.cfg.example +++ b/ejabberdctl.cfg.example @@ -12,20 +12,6 @@ # #POLL=true -#. -#' SMP: SMP support ([enable|auto|disable]) -# -# Explanation in Erlang/OTP documentation: -# enable: starts the Erlang runtime system with SMP support enabled. -# This may fail if no runtime system with SMP support is available. -# auto: starts the Erlang runtime system with SMP support enabled if it -# is available and more than one logical processor are detected. -# disable: starts a runtime system without SMP support. -# -# Default: auto -# -#SMP=auto - #. #' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports # diff --git a/ejabberdctl.template b/ejabberdctl.template index 9c7485fc9..bdc9a9189 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template @@ -2,7 +2,6 @@ # define default configuration POLL=true -SMP=auto ERL_MAX_PORTS=32000 ERL_PROCESSES=250000 ERL_MAX_ETS_TABLES=1400 @@ -69,7 +68,7 @@ done : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}" # define erl parameters -ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS" +ERLANG_OPTS="+K $POLL +P $ERL_PROCESSES $ERL_OPTIONS" if [ -n "$FIREWALL_WINDOW" ] ; then ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}" fi