aboutsummaryrefslogtreecommitdiff
path: root/src/odbc
diff options
context:
space:
mode:
authorJérôme Sautret <jerome.sautret@process-one.net>2008-10-13 15:25:30 +0000
committerJérôme Sautret <jerome.sautret@process-one.net>2008-10-13 15:25:30 +0000
commit7c736a5ea0f7d9fb707ac3d7946722b815fd6dd0 (patch)
tree8d0e5547fa4721cb36e3e04c4a1501d7d557ecb8 /src/odbc
parentReplace mentions of mod_xmlrpc to ejabberd_xmlrpc (diff)
* src/odbc/ejabberd_odbc.erl: log MySQL driver messages.
SVN Revision: 1652
Diffstat (limited to 'src/odbc')
-rw-r--r--src/odbc/ejabberd_odbc.erl14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index da1b01e2c..dfc1ee6c8 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -318,8 +318,7 @@ pgsql_item_to_odbc(_) ->
%% part of init/1
%% Open a database connection to MySQL
mysql_connect(Server, Port, DB, Username, Password, StartInterval) ->
- NoLogFun = fun(_Level,_Format,_Argument) -> ok end,
- case mysql_conn:start(Server, Port, Username, Password, DB, NoLogFun) of
+ case mysql_conn:start(Server, Port, Username, Password, DB, fun log/3) of
{ok, Ref} ->
erlang:monitor(process, Ref),
mysql_conn:fetch(Ref, ["set names 'utf8';"], self()),
@@ -359,3 +358,14 @@ mysql_item_to_odbc(Columns, Recs) ->
% perform a harmless query on all opened connexions to avoid connexion close.
keep_alive(PID) ->
gen_server:call(PID, {sql_query, ?KEEPALIVE_QUERY}, 60000).
+
+% log function used by MySQL driver
+log(Level, Format, Args) ->
+ case Level of
+ debug ->
+ ?DEBUG(Format, Args);
+ normal ->
+ ?INFO_MSG(Format, Args);
+ error ->
+ ?ERROR_MSG(Format, Args)
+ end.