Merge bug22303 into master

3 files changed, 75 insertions, 13 deletions

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 46681125..cc2e8166 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -45,17 +45,30 @@ if "%RABBITMQ_NODENAME%"=="" (
 )

 

 if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-   )

+    if not "%RABBITMQ_NODE_PORT%"=="" (

+       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_NODE_PORT=5672

-   )

+    if "%RABBITMQ_NODE_PORT%"=="" (

+       set RABBITMQ_NODE_PORT=5672

+    )

 )

 

 if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

-    set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin

+    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

+    )

+    for /f "delims=" %%i in ('dir /ad/b "%ERLANG_HOME%"') do if exist "%ERLANG_HOME%\%%i\bin\erlsrv.exe" (

+        set ERLANG_SERVICE_MANAGER_PATH=%ERLANG_HOME%\%%i\bin

+    )

 )

 

 set CONSOLE_FLAG=

diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 92d03789..e30e65bf 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -57,6 +57,7 @@
 -export([start_applications/1, stop_applications/1]).
 -export([unfold/2, ceil/1, queue_fold/3]).
 -export([pid_to_string/1, string_to_pid/1]).
+-export([version_compare/2, version_compare/3]).
 
 -import(mnesia).
 -import(lists).
@@ -561,3 +562,36 @@ string_to_pid(Str) ->
             %% invalid regexp - shouldn't happen
             throw(Error)
     end.
+
+version_compare(A, B, lte) ->
+    case version_compare(A, B) of
+        eq -> true;
+        lt -> true;
+        gt -> false
+    end;
+version_compare(A, B, gte) ->
+    case version_compare(A, B) of
+        eq -> true;
+        gt -> true;
+        lt -> false
+    end;
+version_compare(A, B, Result) ->
+    Result =:= version_compare(A, B).
+
+version_compare([], []) ->
+    eq;
+version_compare([], _ ) ->
+    lt; %% 2.3 < 2.3.1
+version_compare(_ , []) ->
+    gt; %% 2.3.1 > 2.3
+version_compare(A,  B) ->
+    {AStr, ATl} = lists:splitwith(fun (X) -> X =/= $. end, A),
+    {BStr, BTl} = lists:splitwith(fun (X) -> X =/= $. end, B),
+    ANum = list_to_integer(AStr),
+    BNum = list_to_integer(BStr),
+    if ANum =:= BNum -> ATl1 = lists:dropwhile(fun (X) -> X =:= $. end, ATl),
+                        BTl1 = lists:dropwhile(fun (X) -> X =:= $. end, BTl),
+                        version_compare(ATl1, BTl1);
+       ANum < BNum   -> lt;
+       ANum > BNum   -> gt
+    end.
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 02bd0499..0cdb4142 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -261,14 +261,29 @@ get_total_memory({unix,freebsd}) ->
     PageCount * PageSize;
 
 get_total_memory({win32,_OSname}) ->
-    %% Due to the Erlang print format bug, on Windows boxes the memory size is
-    %% broken. For example Windows 7 64 bit with 4Gigs of RAM we get negative
-    %% memory size:
+    %% Due to the Erlang print format bug, on Windows boxes the memory
+    %% size is broken. For example Windows 7 64 bit with 4Gigs of RAM
+    %% we get negative memory size:
     %% > os_mon_sysinfo:get_mem_info().
     %% ["76 -1658880 1016913920 -1 -1021628416 2147352576 2134794240\n"]
-    %% Due to this bug, we don't actually know anything. Even if the number is
-    %% postive we can't be sure if it's correct.
-    unknown;
+    %% Due to this bug, we don't actually know anything. Even if the
+    %% number is postive we can't be sure if it's correct. This only
+    %% affects us on os_mon versions prior to 2.2.1.
+    case application:get_key(os_mon, vsn) of
+        undefined ->
+            unknown;
+        {ok, Version} ->
+            case rabbit_misc:version_compare(Version, "2.2.1", lt) of
+                true -> %% os_mon is < 2.2.1, so we know nothing
+                    unknown;
+                false ->
+                    [Result|_] = os_mon_sysinfo:get_mem_info(),
+                    {ok, [_MemLoad, TotPhys, _AvailPhys,
+                          _TotPage, _AvailPage, _TotV, _AvailV], _RestStr} =
+                        io_lib:fread("~d~d~d~d~d~d~d", Result),
+                    TotPhys
+            end
+    end;
 
 get_total_memory({unix, linux}) ->
     File = read_proc_file("/proc/meminfo"),