Add os_mon to included_application, but start it in ej_system_monitor

3 files changed, 4 insertions, 2 deletions

diff --git a/mix.exs b/mix.exs
index d7ef1707b..fec5c2603 100644
--- a/mix.exs
+++ b/mix.exs
@@ -29,7 +29,7 @@ defmodule Ejabberd.Mixfile do
      included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
                              :fast_tls, :stringprep, :fast_xml, :xmpp,
                              :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
-                             :eimp, :base64url, :jose, :pkix]
+                             :eimp, :base64url, :jose, :pkix, :os_mon]
      ++ cond_apps()]
   end
 
diff --git a/src/ejabberd.app.src.in b/src/ejabberd.app.src.in
index c3dc37306..f1d08b8c7 100644
--- a/src/ejabberd.app.src.in
+++ b/src/ejabberd.app.src.in
@@ -6,7 +6,7 @@
   {modules, []},
   {registered, []},
   {applications, [kernel, stdlib, sasl, ssl]},
-  {included_applications, [lager, mnesia, inets, p1_utils, fast_yaml, fast_tls, pkix, xmpp, cache_tab, eimp]},
+  {included_applications, [os_mon, lager, mnesia, inets, p1_utils, fast_yaml, fast_tls, pkix, xmpp, cache_tab, eimp]},
   {env, [{enabled_backends, [@enabled_backends@]}]},
   {mod, {ejabberd_app, []}}]}.
 
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 1641e0ad9..41e284de4 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -80,6 +80,8 @@ start_included_apps() ->
 	       ok;
 	   (lager)->
 	       ok;
+	   (os_mon)->
+	       ok;
 	   (App) ->
 	       application:ensure_all_started(App)
 	end, Apps).