diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-09-26 21:37:25 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-09-26 21:37:25 +0100 |
| commit | bd048aeb5f9ae6507edbf72060ed403c66a0a037 (patch) | |
| tree | 03bdd8658674c92321e355c261e7d5414648dbeb /scripts/rabbitmq-server | |
| parent | ee3feaaf4c6cde126198c37cbfcc35cc7180e9f2 (diff) | |
| parent | 39496a12d997af16f5ba7928cbc5933105ed57c3 (diff) | |
| download | rabbitmq-server-git-bd048aeb5f9ae6507edbf72060ed403c66a0a037.tar.gz | |
Merged default into bug23764
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 2f80eb96c3..deca5b3042 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -47,6 +47,7 @@ fi [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} +[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand @@ -58,15 +59,13 @@ fi [ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}.log" [ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS=${SASL_LOGS} [ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}-sasl.log" -[ "x" = "x$RABBITMQ_BACKUP_EXTENSION" ] && RABBITMQ_BACKUP_EXTENSION=${BACKUP_EXTENSION} -[ "x" = "x$RABBITMQ_BACKUP_EXTENSION" ] && RABBITMQ_BACKUP_EXTENSION=".1" - -[ -f "${RABBITMQ_LOGS}" ] && cat "${RABBITMQ_LOGS}" >> "${RABBITMQ_LOGS}${RABBITMQ_BACKUP_EXTENSION}" -[ -f "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}" RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' +mkdir -p $(dirname ${RABBITMQ_PID_FILE}) +echo $$ > ${RABBITMQ_PID_FILE} + RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then if erl \ @@ -107,8 +106,9 @@ exec erl \ ${RABBITMQ_SERVER_ERL_ARGS} \ ${RABBITMQ_LISTEN_ARG} \ -sasl errlog_type error \ - -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \ - -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \ + -sasl sasl_error_logger false \ + -rabbit error_logger '{file,"'${RABBITMQ_LOGS}'"}' \ + -rabbit sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \ -os_mon start_cpu_sup true \ -os_mon start_disksup false \ -os_mon start_memsup false \ |