Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

* src/odbc/ejabberd_odbc.erl: ejabberd admin can now choose the

Browse Source 
relational database port to user from ejabberd configuration
file (EJAB-195).
* src/doc/guide.tex: Likewise.

SVN Revision: 740
This commit is contained in:
Mickaël Rémond 2007-03-10 15:53:53 +00:00
parent 0be3fe1377
commit 48c073abd2
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-03-10 Mickael Remond <mickael.remond@process-one.net>
* src/odbc/ejabberd_odbc.erl: ejabberd admin can now choose the
relational database port to user from ejabberd configuration
file (EJAB-195).
* src/doc/guide.tex: Likewise.
2007-03-02 Mickael Remond <mickael.remond@process-one.net>
* src/mod_muc/mod_muc_log.erl: Fix wrong return on check access log.

27
doc/guide.tex
View File

@ -1037,6 +1037,20 @@ parameter:
{odbc_server, {mysql, "localhost", "test", "root", "password"}}.
\end{verbatim}
Optionally, it is possible to define the MySQL port to use. This
option is only useful, in very rare cases, when you are not running
MySQL with the default port setting. The \term{mysql} parameter
can thus take the following form:
\begin{verbatim}
{mysql, "Server", Port, "Database", "Username", "Password"}
\end{verbatim}
The \term{Port} value should be an integer, without quotes. For example:
\begin{verbatim}
{odbc_server, {mysql, "localhost", Port, "test", "root", "password"}}.
\end{verbatim}
\subsubsection{Storage}
\label{mysqlstorage}
\ind{MySQL!storage}
@ -1162,6 +1176,19 @@ form as parameter:
{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
\end{verbatim}
Optionally, it is possible to define the PostgreSQL port to use. This
option is only useful, in very rare cases, when you are not running
PostgreSQL with the default port setting. The \term{pgsql} parameter
can thus take the following form:
\begin{verbatim}
{pgsql, "Server", Port, "Database", "Username", "Password"}
\end{verbatim}
The \term{Port} value should be an integer, without quotes. For example:
\begin{verbatim}
{odbc_server, {pgsql, "localhost", 5432, "database", "ejabberd", "password"}}.
\end{verbatim}
\subsubsection{Storage}
\label{pgsqlstorage}
\ind{PostgreSQL!storage}

19
src/odbc/ejabberd_odbc.erl
View File

@ -34,6 +34,7 @@
-define(STATE_KEY, ejabberd_odbc_state).
-define(MAX_TRANSACTION_RESTARTS, 10).
-define(PGSQL_PORT, 5432).
-define(MYSQL_PORT, 3306).
%%%----------------------------------------------------------------------
@ -113,10 +114,16 @@ escape_like(C) -> odbc_queries:escape(C).
init([Host]) ->
SQLServer = ejabberd_config:get_local_option({odbc_server, Host}),
case SQLServer of
%% Default pgsql port
{pgsql, Server, DB, Username, Password} ->
pgsql_connect(Server, DB, Username, Password);
pgsql_connect(Server, ?PGSQL_PORT, DB, Username, Password);
{pgsql, Server, Port, DB, Username, Password} when is_integer(Port) ->
pgsql_connect(Server, Port, DB, Username, Password);
%% Default mysql port
{mysql, Server, DB, Username, Password} ->
mysql_connect(Server, DB, Username, Password);
mysql_connect(Server, ?MYSQL_PORT, DB, Username, Password);
{mysql, Server, Port, DB, Username, Password} when is_integer(Port) ->
mysql_connect(Server, Port, DB, Username, Password);
_ when is_list(SQLServer) ->
odbc_connect(SQLServer)
end.
@ -229,8 +236,8 @@ odbc_connect(SQLServer) ->
%% part of init/1
%% Open a database connection to PostgreSQL
pgsql_connect(Server, DB, Username, Password) ->
case pgsql:connect(Server, DB, Username, Password) of
pgsql_connect(Server, Port, DB, Username, Password) ->
case pgsql:connect(Server, DB, Username, Password, Port) of
{ok, Ref} ->
{ok, #state{db_ref = Ref, db_type = pgsql}};
{error, Reason} ->
@ -267,9 +274,9 @@ pgsql_item_to_odbc(_) ->
%% part of init/1
%% Open a database connection to MySQL
mysql_connect(Server, DB, Username, Password) ->
mysql_connect(Server, Port, DB, Username, Password) ->
NoLogFun = fun(_Level,_Format,_Argument) -> ok end,
case mysql_conn:start(Server, ?MYSQL_PORT, Username, Password, DB, NoLogFun) of
case mysql_conn:start(Server, Port, Username, Password, DB, NoLogFun) of
{ok, Ref} ->
erlang:monitor(process, Ref),
{ok, #state{db_ref = Ref, db_type = mysql}};