25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-09 15:06:54 +02:00

* src/ejabberd_rdbms.erl: It is now possible to use ldap or

internal authentication with some other modules using relationnal
database storage (EJAB-152). Refactored relational databases
connections initialisation.
* src/ejabberd_auth_odbc.erl: Likewise. odbc supervisor startup is now
delegated to the ejabberd rdbms module.
* src/ejabberd_app.erl: Likewise.

SVN Revision: 664
This commit is contained in:
Mickaël Rémond 2006-10-25 07:56:49 +00:00
parent cd7595e3f4
commit b2a944a4a2
4 changed files with 64 additions and 8 deletions

View File

@ -1,3 +1,12 @@
2006-10-25 Mickael Remond <mickael.remond@process-one.net>
* src/ejabberd_rdbms.erl: It is now possible to use ldap or internal
authentication with some other modules using relationnal database
storage. Refactored relational databases connections initialisation.
* src/ejabberd_auth_odbc.erl: Likewise. odbc supervisor startup is now
delegated to the ejabberd rdbms module.
* src/ejabberd_app.erl: Likewise.
2006-10-17 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_socket.erl: Added sockname/1 and peername/1

View File

@ -28,6 +28,7 @@ start(normal, _Args) ->
gen_mod:start(),
ejabberd_config:start(),
Sup = ejabberd_sup:start_link(),
ejabberd_rdbms:start(),
ejabberd_auth:start(),
cyrsasl:start(),
% Profiling

View File

@ -34,14 +34,6 @@
%%% API
%%%----------------------------------------------------------------------
start(Host) ->
ChildSpec =
{gen_mod:get_module_proc(Host, ejabberd_odbc_sup),
{ejabberd_odbc_sup, start_link, [Host]},
temporary,
infinity,
supervisor,
[ejabberd_odbc_sup]},
supervisor:start_child(ejabberd_sup, ChildSpec),
ejabberd_ctl:register_commands(
Host,
[{"registered-users", "list all registered users"}],

54
src/ejabberd_rdbms.erl Normal file
View File

@ -0,0 +1,54 @@
%%%----------------------------------------------------------------------
%%% File : ejabberd_rdbms.erl
%%% Author : Mickael Remond <mickael.remond@process-one.net>
%%% Purpose : Manage the start of the database modules when needed
%%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@sevcom.net>
%%% Id : $Id: $
%%%----------------------------------------------------------------------
-module(ejabberd_rdbms).
-author('alexey@sevcom.net').
-svn('$Revision: $ ').
-export([start/0]).
-include("ejabberd.hrl").
start() ->
%% Check if ejabberd has been compiled with ODBC
case catch ejabberd_odbc_sup:module_info() of
{'EXIT',{undef,_}} ->
?INFO_MSG("ejabberd has not been compiled with relational database support. Skipping database startup.", []);
_ ->
%% If compiled with ODBC, start ODBC on the needed host
start_hosts()
end.
%% Start relationnal DB module on the nodes where it is needed
start_hosts() ->
lists:foreach(
fun(Host) ->
case needs_odbc(Host) of
true -> start_odbc(Host);
false -> ok
end
end, ?MYHOSTS).
%% Start the ODBC module on the given host
start_odbc(Host) ->
ChildSpec =
{gen_mod:get_module_proc(Host, ejabberd_odbc_sup),
{ejabberd_odbc_sup, start_link, [Host]},
temporary,
infinity,
supervisor,
[ejabberd_odbc_sup]},
supervisor:start_child(ejabberd_sup, ChildSpec).
%% Returns true if we have configured odbc_server for the given host
needs_odbc(Host) ->
LHost = jlib:nameprep(Host),
case ejabberd_config:get_local_option({odbc_server, LHost}) of
undefined ->
false;
_ -> true
end.