diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-09-23 23:20:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 23:20:21 +0300 |
| commit | 1250791f879f28cdf7ce265bb6ec20cee0a8ef54 (patch) | |
| tree | ec5a40d11fe42a3c63132e128a2764b4a8a7dcde | |
| parent | edf98f35087da9f67cea8629cce1a1130299acaf (diff) | |
| parent | bc6d0bcd2ea1e208b6942884b7248cc975ee6442 (diff) | |
| download | rabbitmq-server-git-1250791f879f28cdf7ce265bb6ec20cee0a8ef54.tar.gz | |
Merge pull request #2116 from rabbitmq/rabbitmq-server-2084
Allow setting ERL_MAX_PORTS in rabbitmq-env-conf.bat
| -rw-r--r-- | scripts/rabbitmq-env.bat | 11 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 5 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 232a8755c3..0c97aaa014 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -39,6 +39,17 @@ if exist "!RABBITMQ_CONF_ENV_FILE!" ( call "!RABBITMQ_CONF_ENV_FILE!"
)
+rem Bump ETS table limit to 50000
+if "!ERL_MAX_ETS_TABLES!"=="" (
+ set ERL_MAX_ETS_TABLES=50000
+)
+
+rem Default is defined here:
+rem https://github.com/erlang/otp/blob/master/erts/emulator/beam/erl_port.h
+if "!ERL_MAX_PORTS!"=="" (
+ set ERL_MAX_PORTS=65536
+)
+
set DEFAULT_SCHEDULER_BIND_TYPE=db
if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (
set RABBITMQ_SCHEDULER_BIND_TYPE=!SCHEDULER_BIND_TYPE!
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 440f5802f7..7d4d1b486f 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -215,11 +215,6 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" ( set RABBITMQ_IO_THREAD_POOL_SIZE=64
)
-rem Bump ETS table limit to 50000
-if "!ERL_MAX_ETS_TABLES!"=="" (
- set ERL_MAX_ETS_TABLES=50000
-)
-
set ENV_OK=true
CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!
CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index d921849f35..fe9884abf0 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -301,11 +301,6 @@ if "!RABBITMQ_SERVICE_RESTART!"=="" ( set RABBITMQ_SERVICE_RESTART=restart
)
-rem Bump ETS table limit to 50000
-if "!ERL_MAX_ETS_TABLES!"=="" (
- set ERL_MAX_ETS_TABLES=50000
-)
-
set ERLANG_SERVICE_ARGUMENTS= ^
-pa "!RABBITMQ_EBIN_ROOT:\=/!" ^
-boot start_sasl ^
@@ -347,6 +342,7 @@ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"! -env ERL_CRASH_DUMP="!RABBITMQ_BASE:\=/!/erl_crash.dump" ^
-env ERL_LIBS="!ERL_LIBS!" ^
-env ERL_MAX_ETS_TABLES="!ERL_MAX_ETS_TABLES!" ^
+-env ERL_MAX_PORTS="!ERL_MAX_PORTS!" ^
-workdir "!RABBITMQ_BASE!" ^
-stopaction "rabbit:stop_and_halt()." ^
!RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^
|