summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2019-02-13 05:22:44 +0300
committerMichael Klishin <michael@clojurewerkz.org>2019-02-13 05:22:44 +0300
commit7521ab498a4954eac580e0cf19affd1b9e8ae3d6 (patch)
treeba3f35c96e598eedc016c8006b13d1c569c4fd30 /scripts
parent76c7a01fe4871d1d64057214b68f8246d265322c (diff)
parent414b75c67643da7f7b6d5e02bc777639ac92bc3c (diff)
downloadrabbitmq-server-git-7521ab498a4954eac580e0cf19affd1b9e8ae3d6.tar.gz
Merge branch 'master' into rabbitmq-server-1873-binding-recovery
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server4
-rw-r--r--scripts/rabbitmq-server.bat2
-rw-r--r--scripts/rabbitmq-service.bat2
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index aeac38e46f..b4863057f0 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -219,7 +219,7 @@ fi
# The defaults are meant to reduce RabbitMQ's memory usage and help
# it reclaim memory at the cost of a slight decrease in performance
# (due to an increase in memory operations). These defaults can be
-# overriden using the RABBITMQ_SERVER_ERL_ARGS variable.
+# overridden using the RABBITMQ_SERVER_ERL_ARGS variable.
RABBITMQ_DEFAULT_ALLOC_ARGS="+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30"
${ERL_DIR}erl ${RABBITMQ_DEFAULT_ALLOC_ARGS} \
@@ -374,7 +374,7 @@ else
# This is considered an abnormal process termination. Normally, we
# don't need to specify this exit code because the shell propagates it.
# Unfortunately, the signal handler doesn't work as expected in Dash,
- # thus we need to explicitely restate the exit code.
+ # thus we need to explicitly restate the exit code.
trap "stop_rabbitmq_server; exit 0" HUP TERM TSTP
trap "stop_rabbitmq_server; exit 130" INT
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index d417091732..462db4c10c 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -167,7 +167,7 @@ rem
rem The defaults are meant to reduce RabbitMQ's memory usage and help
rem it reclaim memory at the cost of a slight decrease in performance
rem (due to an increase in memory operations). These defaults can be
-rem overriden using the RABBITMQ_SERVER_ERL_ARGS variable.
+rem overridden using the RABBITMQ_SERVER_ERL_ARGS variable.
set RABBITMQ_DEFAULT_ALLOC_ARGS=+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 7bb1f124b5..e3057f16b5 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -254,7 +254,7 @@ rem
rem The defaults are meant to reduce RabbitMQ's memory usage and help
rem it reclaim memory at the cost of a slight decrease in performance
rem (due to an increase in memory operations). These defaults can be
-rem overriden using the RABBITMQ_SERVER_ERL_ARGS variable.
+rem overridden using the RABBITMQ_SERVER_ERL_ARGS variable.
set RABBITMQ_DEFAULT_ALLOC_ARGS=+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30