Merge branch 'stable'

2 files changed, 11 insertions, 7 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 3e0eaed0d2..cb341dc09c 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -143,7 +143,6 @@ start_rabbitmq_server() {
 }
 
 stop_rabbitmq_server() {
-    
     RABBITMQCTL="$(dirname "$0")/rabbitmqctl"
 
     if ${RABBITMQCTL} -n ${RABBITMQ_NODENAME} status >/dev/null 2>&1; then
@@ -164,7 +163,7 @@ check_not_empty() {
     local value
     eval value=\$$name
     if [ -z "$value" ]; then
-        echo "Error: ENV variable should be defined: $1. 
+        echo "Error: ENV variable should be defined: $1.
        Please check rabbitmq-env, rabbitmq-defaults, and $CONF_ENV_FILE script files"
         exit 78
     fi
diff --git a/src/rabbit.erl b/src/rabbit.erl
index bc26784dff..3dbee29543 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -787,11 +787,16 @@ log_banner() ->
     rabbit_log:info("~n~s", [Banner]).
 
 warn_if_kernel_config_dubious() ->
-    case erlang:system_info(kernel_poll) of
-        true  -> ok;
-        false -> rabbit_log:warning(
-                   "Kernel poll (epoll, kqueue, etc) is disabled. Throughput "
-                   "and CPU utilization may worsen.~n")
+    case os:type() of
+        {win32, _} ->
+            ok;
+        _ ->
+            case erlang:system_info(kernel_poll) of
+                true  -> ok;
+                false -> rabbit_log:warning(
+                           "Kernel poll (epoll, kqueue, etc) is disabled. Throughput "
+                           "and CPU utilization may worsen.~n")
+            end
     end,
     AsyncThreads = erlang:system_info(thread_pool_size),
     case AsyncThreads < ?ASYNC_THREADS_WARNING_THRESHOLD of