diff --git a/ebin/riak_core.app b/ebin/riak_core.app index d3cb5ce21..45b663af3 100644 --- a/ebin/riak_core.app +++ b/ebin/riak_core.app @@ -67,7 +67,8 @@ sasl, crypto, riak_sysmon, - webmachine + webmachine, + os_mon ]}, {mod, { riak_core_app, []}}, {env, [ diff --git a/src/riak_core_stat.erl b/src/riak_core_stat.erl index 7e0ab8f0f..c3cf4bdb6 100644 --- a/src/riak_core_stat.erl +++ b/src/riak_core_stat.erl @@ -46,14 +46,8 @@ }). %% @spec start_link() -> {ok,Pid} | ignore | {error,Error} -%% @doc Start the server. Also start the os_mon application, if it's -%% not already running. +%% @doc Start the server. start_link() -> - case application:start(os_mon) of - ok -> ok; - {error, {already_started, os_mon}} -> ok - %% die if os_mon doesn't start - end, gen_server2:start_link({local, ?MODULE}, ?MODULE, [], []). %% @spec get_stats() -> proplist()