Merge branch 'master' into rabbitmq-server-590

4 files changed, 37 insertions, 20 deletions

diff --git a/README.md b/README.md
index ae6f9b2d01..9e2a046dff 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,11 @@
  * [Documentation guides](http://www.rabbitmq.com/documentation.html)
  * [Client libraries and tools](http://www.rabbitmq.com/devtools.html)
 
+## Building From Source and Packaging
+
+ * [Building RabbitMQ Server From Source](http://www.rabbitmq.com/build-server.html)
+ * [Building RabbitMQ Server Packages](http://www.rabbitmq.com/build-server.html)
+
 
 ## Getting Help
 
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 1bfc7f013d..78629547f7 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -1399,28 +1399,32 @@ get_monitor() {
     if [ $rabbit_running -eq $OCF_SUCCESS ]
     then
             ocf_log info "${LH} rabbit app is running. checking if we are the part of healthy cluster"
-            rc_check=$OCF_ERR_GENERIC
-            nodelist=$(get_alive_pacemaker_nodes_but)
-            for node in $nodelist
-            do
-                # Do not refetch the master status for *this* node as we know it already
-                if [ $rc -ne $OCF_RUNNING_MASTER ] ; then
+
+            if [ $rc -eq $OCF_RUNNING_MASTER ] ; then
+                # The master is always running inside of its cluster
+                ocf_log info "${LH} rabbit app is running and is master of cluster"
+                rc_check=$OCF_SUCCESS
+            else
+                rc_check=$OCF_ERR_GENERIC
+                nodelist=$(get_alive_pacemaker_nodes_but)
+                for node in $nodelist
+                do
                     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}"
-                fi
-                if [ $status_master -eq 0 ] ; then
-                    ocf_log info "${LH} rabbit app is running. master is $node"
-                    if get_running_nodes | grep -q $(rabbit_node_name $node)
-                    then
-                        ocf_log info "${LH} rabbit app is running and is member of healthy cluster"
-                        rc_check=$OCF_SUCCESS
-                        break
+                    if [ $status_master -eq 0 ] ; then
+                        ocf_log info "${LH} rabbit app is running. master is $node"
+                        if get_running_nodes | grep -q $(rabbit_node_name $node)
+                        then
+                            ocf_log info "${LH} rabbit app is running and is member of healthy cluster"
+                            rc_check=$OCF_SUCCESS
+                            break
+                        fi
                     fi
-                fi
-            done
-            [ $rc_check -eq $OCF_ERR_GENERIC ] && ocf_log err "${LH} rabbit node is running out of the cluster"
+                done
+                [ $rc_check -eq $OCF_ERR_GENERIC ] && ocf_log err "${LH} rabbit node is running out of the cluster"
+            fi
     else
       if [ "$OCF_CHECK_LEVEL" -gt 20 ]; then
             ocf_log info "${LH} rabbit app is not running. checking if there is a master"
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 59425540e6..404d167d03 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -144,6 +144,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

@@ -167,8 +173,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:\=/!"\" ^

diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl
index e8b7ce5669..efe8495299 100644
--- a/src/rabbit_error_logger.erl
+++ b/src/rabbit_error_logger.erl
@@ -103,10 +103,12 @@ publish1(RoutingKey, Format, Data, LogExch) ->
     Timestamp = time_compat:os_system_time(seconds),
 
     Args = [truncate:term(A, ?LOG_TRUNC) || A <- Data],
+    Headers = [{<<"node">>, longstr, list_to_binary(atom_to_list(node()))}],
     {ok, _DeliveredQPids} =
         rabbit_basic:publish(LogExch, RoutingKey,
                              #'P_basic'{content_type = <<"text/plain">>,
-                                        timestamp    = Timestamp},
+                                        timestamp    = Timestamp,
+                                        headers      = Headers},
                              list_to_binary(io_lib:format(Format, Args))),
     ok.