Merge branch 'master' into rabbitmq-server-550

3 files changed, 21 insertions, 4 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index a197ec31ba..ad06839bfc 100644
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -103,10 +103,15 @@ fi
 
 ##--- Set environment vars RABBITMQ_<var_name> to defaults if not set
 
+SED_OPT="-E"
+if [ $(uname -s) = "Linux" ]; then
+    SED_OPT="-r"
+fi
+
 rmq_normalize_path() {
     local path=$1
 
-    echo "$path" | sed -E -e 's,//+,/,g' -e 's,(.)/$,\1,'
+    echo "$path" | sed $SED_OPT -e 's,//+,/,g' -e 's,(.)/$,\1,'
 }
 
 rmq_normalize_path_var() {
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index aa077aa0df..d1088bc42d 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -1403,12 +1403,18 @@ get_monitor() {
             nodelist=$(get_alive_pacemaker_nodes_but)
             for node in $nodelist
             do
+                status_master=1
                 # Do not refetch the master status for *this* node as we know it already
                 if [ $rc -ne $OCF_RUNNING_MASTER ] ; then
                     ocf_log info "${LH} rabbit app is running. looking for master on $node"
                     is_master $node
                     status_master=$?
                     ocf_log info "${LH} fetched master attribute for $node. attr value is ${status_master}"
+                else
+                    # The master is always running inside of its cluster
+                    ocf_log info "${LH} rabbit app is running and is member of healthy cluster"
+                    rc_check=$OCF_SUCCESS
+                    break
                 fi
                 if [ $status_master -eq 0 ] ; then
                     ocf_log info "${LH} rabbit app is running. master is $node"
@@ -1936,7 +1942,7 @@ action_notify() {
                     ocf_log info "${LH} post-start end."
                     if [ -s "${OCF_RESKEY_definitions_dump_file}" ] ; then
                         ocf_log info "File ${OCF_RESKEY_definitions_dump_file} exists"
-                        ocf_run  curl -X POST -u $OCF_RESKEY_admin_user:$OCF_RESKEY_admin_password $OCF_RESKEY_host_ip:15672/api/definitions --header "Content-Type:application/json" -d @$OCF_RESKEY_definitions_dump_file
+                        ocf_run curl --silent --show-error --request POST --user $OCF_RESKEY_admin_user:$OCF_RESKEY_admin_password $OCF_RESKEY_host_ip:15672/api/definitions --header "Content-Type:application/json" --data @$OCF_RESKEY_definitions_dump_file
                         rc=$?
                         if [ $rc -eq $OCF_SUCCESS ] ; then
                             ocf_log info "RMQ definitions have imported succesfully."
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 2e0b78fc03..deddba11ec 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -156,6 +156,12 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
    )

 )

 

+if "!RABBITMQ_LOGS!" == "-" (

+    set RABBIT_LAGER_HANDLER=tty

+) else (

+    set RABBIT_LAGER_HANDLER=\""!RABBITMQ_LOGS:\=/!"\"

+)

+

 set RABBITMQ_START_RABBIT=

 if "!RABBITMQ_NODE_ONLY!"=="" (

     set RABBITMQ_START_RABBIT=-s "!RABBITMQ_BOOT_MODULE!" boot

@@ -179,8 +185,8 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^

 -sasl errlog_type error ^

 -sasl sasl_error_logger false ^

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

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

+-rabbit lager_log_root \""!RABBITMQ_LOG_BASE:\=/!"\" ^

+-rabbit lager_handler !RABBIT_LAGER_HANDLER! ^

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

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

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