diff options
| author | Marek Majkowski <majek@lshift.net> | 2009-09-28 12:44:07 +0100 |
|---|---|---|
| committer | Marek Majkowski <majek@lshift.net> | 2009-09-28 12:44:07 +0100 |
| commit | 66fd625d73749a5371daf50c927be564b99ff49d (patch) | |
| tree | 2ff512ff5cc7e710ec6156196297c8163acb0abd | |
| parent | 9f47dc06410c0a6cf5f51c1e988458357d15149a (diff) | |
| download | rabbitmq-server-66fd625d73749a5371daf50c927be564b99ff49d.tar.gz | |
minor os_mon fixes
| -rwxr-xr-x | scripts/rabbitmq-server | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 2 | ||||
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 3 |
5 files changed, 10 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index dcc23f79..89537ddf 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -100,8 +100,10 @@ exec erl \ -sasl errlog_type error \ -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \ -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \ + -os_mon start_cpu_sup true \ + -os_mon start_disksup false \ -os_mon start_memsup false \ - -os_mon system_memory_high_watermark 0.70 \ + -os_mon system_memory_high_watermark 0.7 \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ ${RABBITMQ_CLUSTER_CONFIG_OPTION} \ ${RABBITMQ_SERVER_START_ARGS} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 3f5ac3e7..6439baeb 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -125,6 +125,8 @@ if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" ( %RABBITMQ_SERVER_ERL_ARGS% ^
-sasl errlog_type error ^
-sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^
+-os_mon start_cpu_sup true ^
+-os_mon start_disksup false ^
-os_mon start_memsup false ^
-os_mon system_memory_high_watermark 0.7 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 480acdda..09c5993e 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -170,6 +170,8 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^
-sasl errlog_type error ^
-sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^
+-os_mon start_cpu_sup true ^
+-os_mon start_disksup false ^
-os_mon start_memsup false ^
-os_mon system_memory_high_watermark 0.7 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index f19facfd..d7a9497c 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -142,7 +142,8 @@ start(normal, []) -> case MemoryWatermark of {ok, false} -> ok; {ok, off} -> ok; - {ok, Float} -> start_child(vm_memory_monitor, [Float]) + {ok, Float} -> start_child(vm_memory_monitor, [Float]); + undefined -> throw({undefined, os_mon, system_memory_high_watermark, settings}) end, ok = rabbit_amqqueue:start(), diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 2d10f069..cdd53236 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -124,8 +124,6 @@ get_total_memory({unix, linux}) -> get_total_memory(_OsType) -> unknown. --define(BUFFER_SIZE, 1024). - %% A line looks like "Foo bar: 123456." parse_line_mach(Line) -> [Name, RHS | _Rest] = string:tokens(Line, ":"), @@ -152,6 +150,7 @@ read_proc_file(File) -> file:close(IoDevice), lists:flatten(lists:reverse(Res)). +-define(BUFFER_SIZE, 1024). read_proc_file(IoDevice, Acc) -> case file:read(IoDevice, ?BUFFER_SIZE) of {ok, Res} -> read_proc_file(IoDevice, [Res | Acc]); |