From ccbad98f132b1c6d6c618cea318f051f617fb59d Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Tue, 18 Jan 2011 14:07:48 +0000 Subject: Satisfying bit first: remove rabbitmq-multi and all trivial references. --- scripts/rabbitmq-multi | 87 ---------------------------------------- scripts/rabbitmq-multi.bat | 99 ---------------------------------------------- 2 files changed, 186 deletions(-) delete mode 100755 scripts/rabbitmq-multi delete mode 100644 scripts/rabbitmq-multi.bat (limited to 'scripts') diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi deleted file mode 100755 index 33883702b1..0000000000 --- a/scripts/rabbitmq-multi +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -## The contents of this file are subject to the Mozilla Public License -## Version 1.1 (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://www.mozilla.org/MPL/ -## -## Software distributed under the License is distributed on an "AS IS" -## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -## License for the specific language governing rights and limitations -## under the License. -## -## The Original Code is RabbitMQ. -## -## The Initial Developers of the Original Code are LShift Ltd, -## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. -## -## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, -## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd -## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial -## Technologies LLC, and Rabbit Technologies Ltd. -## -## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift -## Ltd. Portions created by Cohesive Financial Technologies LLC are -## Copyright (C) 2007-2010 Cohesive Financial Technologies -## LLC. Portions created by Rabbit Technologies Ltd are Copyright -## (C) 2007-2010 Rabbit Technologies Ltd. -## -## All Rights Reserved. -## -## Contributor(s): ______________________________________. -## - -SCRIPT_HOME=$(dirname $0) -PIDS_FILE=/var/lib/rabbitmq/pids -MULTI_ERL_ARGS= -MULTI_START_ARGS= -CONFIG_FILE=/etc/rabbitmq/rabbitmq - -. `dirname $0`/rabbitmq-env - -DEFAULT_NODE_IP_ADDRESS=0.0.0.0 -DEFAULT_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} -if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] -then - if [ "x" != "x$RABBITMQ_NODE_PORT" ] - then RABBITMQ_NODE_IP_ADDRESS=${DEFAULT_NODE_IP_ADDRESS} - fi -else - if [ "x" = "x$RABBITMQ_NODE_PORT" ] - then RABBITMQ_NODE_PORT=${DEFAULT_NODE_PORT} - fi -fi -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} -[ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME} -[ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE} -[ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS} -[ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${MULTI_START_ARGS} -[ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} - -export \ - RABBITMQ_NODENAME \ - RABBITMQ_NODE_IP_ADDRESS \ - RABBITMQ_NODE_PORT \ - RABBITMQ_SCRIPT_HOME \ - RABBITMQ_PIDS_FILE \ - RABBITMQ_CONFIG_FILE - -RABBITMQ_CONFIG_ARG= -[ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" - -# we need to turn off path expansion because some of the vars, notably -# RABBITMQ_MULTI_ERL_ARGS, may contain terms that look like globs and -# there is no other way of preventing their expansion. -set -f - -exec erl \ - -pa "${RABBITMQ_HOME}/ebin" \ - -noinput \ - -hidden \ - ${RABBITMQ_MULTI_ERL_ARGS} \ - -sname rabbitmq_multi$$ \ - ${RABBITMQ_CONFIG_ARG} \ - -s rabbit_multi \ - ${RABBITMQ_MULTI_START_ARGS} \ - -extra "$@" diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat deleted file mode 100644 index ec61dc998e..0000000000 --- a/scripts/rabbitmq-multi.bat +++ /dev/null @@ -1,99 +0,0 @@ -@echo off -REM The contents of this file are subject to the Mozilla Public License -REM Version 1.1 (the "License"); you may not use this file except in -REM compliance with the License. You may obtain a copy of the License at -REM http://www.mozilla.org/MPL/ -REM -REM Software distributed under the License is distributed on an "AS IS" -REM basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -REM License for the specific language governing rights and limitations -REM under the License. -REM -REM The Original Code is RabbitMQ. -REM -REM The Initial Developers of the Original Code are LShift Ltd, -REM Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. -REM -REM Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, -REM Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd -REM are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial -REM Technologies LLC, and Rabbit Technologies Ltd. -REM -REM Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift -REM Ltd. Portions created by Cohesive Financial Technologies LLC are -REM Copyright (C) 2007-2010 Cohesive Financial Technologies -REM LLC. Portions created by Rabbit Technologies Ltd are Copyright -REM (C) 2007-2010 Rabbit Technologies Ltd. -REM -REM All Rights Reserved. -REM -REM Contributor(s): ______________________________________. -REM - -setlocal - -rem Preserve values that might contain exclamation marks before -rem enabling delayed expansion -set TDP0=%~dp0 -set STAR=%* -setlocal enabledelayedexpansion - -if "!RABBITMQ_BASE!"=="" ( - set RABBITMQ_BASE=!APPDATA!\RabbitMQ -) - -if "!COMPUTERNAME!"=="" ( - set COMPUTERNAME=localhost -) - -if "!RABBITMQ_NODENAME!"=="" ( - set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME! -) - -if "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( - if not "!RABBITMQ_NODE_PORT!"=="" ( - set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0 - ) -) else ( - if "!RABBITMQ_NODE_PORT!"=="" ( - set RABBITMQ_NODE_PORT=5672 - ) -) - -set RABBITMQ_PIDS_FILE=!RABBITMQ_BASE!\rabbitmq.pids -set RABBITMQ_SCRIPT_HOME=!TDP0! - -if "!RABBITMQ_CONFIG_FILE!"=="" ( - set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq -) - -if exist "!RABBITMQ_CONFIG_FILE!.config" ( - set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!" -) else ( - set RABBITMQ_CONFIG_ARG= -) - -if not exist "!ERLANG_HOME!\bin\erl.exe" ( - echo. - echo ****************************** - echo ERLANG_HOME not set correctly. - echo ****************************** - echo. - echo Please either set ERLANG_HOME to point to your Erlang installation or place the - echo RabbitMQ server distribution in the Erlang lib folder. - echo. - exit /B -) - -"!ERLANG_HOME!\bin\erl.exe" ^ --pa "!TDP0!..\ebin" ^ --noinput -hidden ^ -!RABBITMQ_MULTI_ERL_ARGS! ^ --sname rabbitmq_multi!RANDOM! ^ -!RABBITMQ_CONFIG_ARG! ^ --s rabbit_multi ^ -!RABBITMQ_MULTI_START_ARGS! ^ --extra !STAR! - -endlocal -endlocal -- cgit v1.2.1 From fc9ff1594a18726a3e62d101d6c02056fe1488e2 Mon Sep 17 00:00:00 2001 From: Emile Joubert Date: Thu, 24 Feb 2011 18:32:56 +0000 Subject: Create log backups in the correct folder on Windows --- scripts/rabbitmq-server.bat | 15 ++++++--------- scripts/rabbitmq-service.bat | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) (limited to 'scripts') diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 2ca9f2b37a..5e2097dbe9 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -72,17 +72,14 @@ rem Log management (rotation, filtering based of size...) is left as an exercice set BACKUP_EXTENSION=.1 -set LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log -set SASL_LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log - -set LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log!BACKUP_EXTENSION! -set SASL_LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log!BACKUP_EXTENSION! +set LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log +set SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log if exist "!LOGS!" ( - type "!LOGS!" >> "!LOGS_BACKUP!" + type "!LOGS!" >> "!LOGS!!BACKUP_EXTENSION!" ) if exist "!SASL_LOGS!" ( - type "!SASL_LOGS!" >> "!SASL_LOGS_BACKUP!" + type "!SASL_LOGS!" >> "!SASL_LOGS!!BACKUP_EXTENSION!" ) rem End of log management @@ -144,10 +141,10 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( +P 1048576 ^ -kernel inet_default_connect_options "[{nodelay, true}]" ^ !RABBITMQ_LISTEN_ARG! ^ --kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^ +-kernel error_logger {file,\""!LOGS:\=/!"\"} ^ !RABBITMQ_SERVER_ERL_ARGS! ^ -sasl errlog_type error ^ --sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^ +-sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^ -os_mon start_cpu_sup true ^ -os_mon start_disksup false ^ -os_mon start_memsup false ^ diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index bc452fea59..aa428a8c4e 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -105,17 +105,14 @@ rem Log management (rotation, filtering based on size...) is left as an exercise set BACKUP_EXTENSION=.1 -set LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log -set SASL_LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log - -set LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log!BACKUP_EXTENSION! -set SASL_LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log!BACKUP_EXTENSION! +set LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log +set SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log if exist "!LOGS!" ( - type "!LOGS!" >> "!LOGS_BACKUP!" + type "!LOGS!" >> "!LOGS!!BACKUP_EXTENSION!" ) if exist "!SASL_LOGS!" ( - type "!SASL_LOGS!" >> "!SASL_LOGS_BACKUP!" + type "!SASL_LOGS!" >> "!SASL_LOGS!!BACKUP_EXTENSION!" ) rem End of log management @@ -209,10 +206,10 @@ set ERLANG_SERVICE_ARGUMENTS= ^ +A30 ^ -kernel inet_default_connect_options "[{nodelay,true}]" ^ !RABBITMQ_LISTEN_ARG! ^ --kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^ +-kernel error_logger {file,\""!LOGS:\=/!"\"} ^ !RABBITMQ_SERVER_ERL_ARGS! ^ -sasl errlog_type error ^ --sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^ +-sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^ -os_mon start_cpu_sup true ^ -os_mon start_disksup false ^ -os_mon start_memsup false ^ -- cgit v1.2.1