1 files changed, 60 insertions, 52 deletions
diff --git a/src/ejabberd.erl b/src/ejabberd.erl
index 2f6d2feba..ef3b85c15 100644
--- a/src/ejabberd.erl
+++ b/src/ejabberd.erl
@@ -10,62 +10,70 @@
 -author('alexey@sevcom.net').
 -vsn('$Revision$ ').
 
--export([start/0, init/0]).
-
--include("ejabberd.hrl").
+-export([start/0, stop/0]).
 
 start() ->
-    spawn(?MODULE, init, []).
-
-init() ->
-    register(ejabberd, self()),
-    % Profiling
-    %eprof:start(),
-    %eprof:profile([self()]),
-    %erlang:system_flag(fullsweep_after, 0),
-    error_logger:logfile({open, ?ERROR_LOG_PATH}),
-    randoms:start(),
-    ok = erl_ddll:load_driver(".", expat_erl),
-    Port = open_port({spawn, expat_erl}, [binary]),
-    db_init(),
-    sha:start(),
-    translate:start(),
-    acl:start(),
-    gen_mod:start(),
-    ejabberd_config:start(),
-    ejabberd_auth:start(),
-    ejabberd_router:start(),
-    ejabberd_sm:start(),
-    ejabberd_s2s:start(),
-    ejabberd_local:start(),
-    ejabberd_listener:start(),
-    load_modules(),
-    loop(Port).
+    application:start(mnesia),
+    application:start(ejabberd).
 
+stop() ->
+    application:stop(ejabberd).
 
-loop(Port) ->
-    receive
-	_ ->
-	    loop(Port)
-    end.
 
-db_init() ->
-    case mnesia:system_info(extra_db_nodes) of
-	[] ->
-	    mnesia:create_schema([node()]);
-	_ ->
-	    ok
-    end,
-    mnesia:start(),
-    mnesia:wait_for_tables(mnesia:system_info(local_tables), infinity).
+%-include("ejabberd.hrl").
 
-load_modules() ->
-    case ejabberd_config:get_local_option(modules) of
-	undefined ->
-	    ok;
-	Modules ->
-	    lists:foreach(fun({Module, Args}) ->
-				  gen_mod:start_module(Module, Args)
-			  end, Modules)
-    end.
+%start() ->
+%    spawn(?MODULE, init, []).
+%
+%init() ->
+%    register(ejabberd, self()),
+%    % Profiling
+%    %eprof:start(),
+%    %eprof:profile([self()]),
+%    %erlang:system_flag(fullsweep_after, 0),
+%    error_logger:logfile({open, ?ERROR_LOG_PATH}),
+%    randoms:start(),
+%    ok = erl_ddll:load_driver(".", expat_erl),
+%    Port = open_port({spawn, expat_erl}, [binary]),
+%    db_init(),
+%    sha:start(),
+%    translate:start(),
+%    acl:start(),
+%    gen_mod:start(),
+%    ejabberd_config:start(),
+%    ejabberd_auth:start(),
+%    ejabberd_router:start(),
+%    ejabberd_sm:start(),
+%    ejabberd_s2s:start(),
+%    ejabberd_local:start(),
+%    ejabberd_listener:start(),
+%    load_modules(),
+%    loop(Port).
+%
+%
+%loop(Port) ->
+%    receive
+%	_ ->
+%	    loop(Port)
+%    end.
+%
+%db_init() ->
+%    case mnesia:system_info(extra_db_nodes) of
+%	[] ->
+%	    mnesia:create_schema([node()]);
+%	_ ->
+%	    ok
+%    end,
+%    mnesia:start(),
+%    mnesia:wait_for_tables(mnesia:system_info(local_tables), infinity).
+%
+%load_modules() ->
+%    case ejabberd_config:get_local_option(modules) of
+%	undefined ->
+%	    ok;
+%	Modules ->
+%	    lists:foreach(fun({Module, Args}) ->
+%				  gen_mod:start_module(Module, Args)
+%			  end, Modules)
+%    end.