diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 17:56:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 17:56:25 +0300 |
| commit | a81cc7f91b5b5c02907be16de665eefc3d2077ae (patch) | |
| tree | ed93874131850caeeb1b9a7f05a053e750704309 /scripts/rabbitmq-server.ocf | |
| parent | 9d8130bedc708b79e9b31277e9f6a331a23cb7e5 (diff) | |
| parent | 054c72d6dd3b1c02b9550d225577f63bda6bae00 (diff) | |
| download | rabbitmq-server-git-a81cc7f91b5b5c02907be16de665eefc3d2077ae.tar.gz | |
Merge branch 'stable'
Conflicts:
scripts/rabbitmq-server.ocf
Diffstat (limited to 'scripts/rabbitmq-server.ocf')
| -rwxr-xr-x | scripts/rabbitmq-server.ocf | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/scripts/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf index cb3895ae76..96935b71c7 100755 --- a/scripts/rabbitmq-server.ocf +++ b/scripts/rabbitmq-server.ocf @@ -30,7 +30,6 @@ ## OCF_RESKEY_mnesia_base ## OCF_RESKEY_server_start_args ## OCF_RESKEY_pid_file -## OCF_RESKEY_limit_nofile ####################################################################### # Initialization: @@ -45,13 +44,11 @@ OCF_RESKEY_ctl_default="/usr/sbin/rabbitmqctl" OCF_RESKEY_nodename_default="rabbit@localhost" OCF_RESKEY_log_base_default="/var/log/rabbitmq" OCF_RESKEY_pid_file_default="/var/run/rabbitmq/pid" -OCF_RESKEY_limit_nofile_default="65535" : ${OCF_RESKEY_server=${OCF_RESKEY_server_default}} : ${OCF_RESKEY_ctl=${OCF_RESKEY_ctl_default}} : ${OCF_RESKEY_nodename=${OCF_RESKEY_nodename_default}} : ${OCF_RESKEY_log_base=${OCF_RESKEY_log_base_default}} : ${OCF_RESKEY_pid_file=${OCF_RESKEY_pid_file_default}} -: ${OCF_RESKEY_limit_nofile=${OCF_RESKEY_limit_nofile_default}} meta_data() { cat <<END @@ -147,14 +144,6 @@ Location of the file in which the pid will be stored <content type="string" default="${OCF_RESKEY_pid_file_default}" /> </parameter> -<parameter name="limit_nofile" unique="0" required="0"> -<longdesc lang="en"> -Soft and hard limit for NOFILE -</longdesc> -<shortdesc lang="en">NOFILE limit</shortdesc> -<content type="string" default="${OCF_RESKEY_limit_nofile_default}" /> -</parameter> - </parameters> <actions> @@ -187,7 +176,6 @@ RABBITMQ_LOG_BASE=$OCF_RESKEY_log_base RABBITMQ_MNESIA_BASE=$OCF_RESKEY_mnesia_base RABBITMQ_SERVER_START_ARGS=$OCF_RESKEY_server_start_args RABBITMQ_PID_FILE=$OCF_RESKEY_pid_file -RABBITMQ_LIMIT_NOFILE=$OCF_RESKEY_limit_nofile [ ! -z $RABBITMQ_NODENAME ] && NODENAME_ARG="-n $RABBITMQ_NODENAME" [ ! -z $RABBITMQ_NODENAME ] && export RABBITMQ_NODENAME @@ -295,9 +283,6 @@ rabbit_start() { export_vars - # RabbitMQ requires high soft and hard limits for NOFILE - set_limits - setsid sh -c "$RABBITMQ_SERVER > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err" & # Wait for the server to come up. |