* src/odbc/ejabberd_odbc.erl: log MySQL driver messages (merge 1652 from trunk).

SVN Revision: 1653

diff --git a/ChangeLog b/ChangeLog
index 8b55a35aaecc98f889d6facd549e666e298e7b7f..4c9be11e072cc19f2d8bccd37193a24e7aac2aad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-13  Jerome Sautret  <jerome.sautret@process-one.net>
+
+       * src/odbc/ejabberd_odbc.erl: log MySQL driver messages.
+
 2008-10-07  Jerome Sautret  <jerome.sautret@process-one.net>
 
        * src/mod_roster_odbc.erl: fix MySQL multiple requests issue.

diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index 4921fdb635438407bf591e8a796c435b11055699..c270dd67c7a6a9d381a081b29d71a74f0d763c9b 100644 (file)
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -304,8 +304,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()), 
@@ -340,3 +339,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.