Pre-1.0 EUnit fixes for OTP app dependencies

basho · Sep 3, 2011 · faba22f · faba22f
1 parent 16a187a
commit faba22f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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()