Merge branch 'master' into erlang.mk

3 files changed, 15 insertions, 14 deletions

diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 7465072d19..ffc68035dc 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -214,9 +214,9 @@ REM [ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS}
 REM [ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}.log"
 if "!RABBITMQ_LOGS!"=="" (
 	if "!LOGS!"=="" (
-		set LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log
+		set RABBITMQ_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log
 	) else (
-		set LOGS=!LOGS!
+		set RABBITMQ_LOGS=!LOGS!
 	)
 )
 
@@ -224,9 +224,9 @@ REM [ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS=${SASL_LOGS}
 REM [ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}-sasl.log"
 if "!RABBITMQ_SASL_LOGS!"=="" (
 	if "!SASL_LOGS!"=="" (
-		set SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log
+		set RABBITMQ_SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log
 	) else (
-		set SASL_LOGS=!SASL_LOGS!
+		set RABBITMQ_SASL_LOGS=!SASL_LOGS!
 	)
 )
 
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 5ccda7b745..6404a7dbd2 100644
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -286,7 +286,7 @@ END
 su_rabbit_cmd() {
     local timeout
     if [ "$1" = "-t" ]; then
-      timeout=="/usr/bin/timeout ${OCF_RESKEY_command_timeout} $2"
+      timeout="/usr/bin/timeout ${OCF_RESKEY_command_timeout} $2"
       shift 2
     else
       timeout=$COMMAND_TIMEOUT
@@ -404,7 +404,8 @@ rmq_setup_env() {
     # user
     for dir in ${PID_DIR} "${OCF_RESKEY_mnesia_base}" "${OCF_RESKEY_log_dir}"; do
         if test -e ${dir}; then
-            local files=$(su -s /bin/sh - $OCF_RESKEY_username -c "find ${dir} ! -writable")
+            local files
+            files=$(su -s /bin/sh - $OCF_RESKEY_username -c "find ${dir} ! -writable")
             if [ "${files}" ]; then
                 ocf_log warn "Directory ${dir} is not writable by ${OCF_RESKEY_username}, chowning."
                 chown -R ${OCF_RESKEY_username}:${OCF_RESKEY_groupname} "${dir}"
@@ -539,7 +540,6 @@ get_running_nodes() {
 get_all_pacemaker_nodes()
 {
     echo `crm_node -l | awk '{print $2}' | grep -v "^$" | sed -e '/(null)/d'`
-    return $?
 }
 
 # Get alive cluster nodes in visible partition, but the specified one
@@ -550,7 +550,6 @@ get_alive_pacemaker_nodes_but()
     else
         echo `crm_node -l -p | sed -e "s/${1}//g" | sed -e '/(null)/d'`
     fi
-    return $?
 }
 
 check_need_join_to() {
@@ -1108,13 +1107,15 @@ check_timeouts() {
     fi
 
     local count
-    count=`crm_attribute -N $THIS_PCMK_NODE -l reboot --name $crm_attr_name --query 2>/dev/null | awk '{print $3}' | awk -F "=" '{print $2}' | sed -e '/(null)/d'`
-    if [ $? -ne 0 ]; then
+    count=`crm_attribute -N $THIS_PCMK_NODE -l reboot --name $crm_attr_name --query 2>/dev/null`
+    op_rc=$?
+    if [ $op_rc -ne 0 ]; then
         # the crm_attribute exited with error. In that case most probably it printed garbage
         # instead of the number we need. So defensively assume that it is zero.
 
         count=0
     fi
+    count=`echo "${count}" | awk '{print $3}' | awk -F "=" '{print $2}' | sed -e '/(null)/d'`
 
     count=$((count+1))
     # There is a slight chance that this piece of code will be executed twice simultaneously.
@@ -1135,8 +1136,8 @@ wait_sync() {
   wait_time=$1
 
   queues="${COMMAND_TIMEOUT} ${OCF_RESKEY_ctl} list_queues name state"
-  su_rabbit_cmd -t "${wait_time}s" "sh -c \"while $queues | grep -q 'syncing,'; \
-      do sleep 1; done\""
+  su_rabbit_cmd -t "${wait_time}" "sh -c \"while ${queues} | grep -q 'syncing,'; \
+      do sleep 2; done\""
   return $?
 }
 
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 8f75a486ec..62da2f6256 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -96,8 +96,8 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^

 -sasl errlog_type error ^

 -sasl sasl_error_logger false ^

--rabbit error_logger {file,\""!LOGS:\=/!"\"} ^

--rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^

+-rabbit error_logger {file,\""!RABBITMQ_LOGS:\=/!"\"} ^

+-rabbit sasl_error_logger {file,\""!RABBITMQ_SASL_LOGS:\=/!"\"} ^

 -rabbit enabled_plugins_file \""!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!"\" ^

 -rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

 -rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^