Author: fdmanana
Date: Wed Jul 6 12:27:15 2011
New Revision: 1143376
URL: http://svn.apache.org/viewvc?rev=1143376&view=rev
Log:
Merge revision 1143375 from trunk
Redefine logging macros
With these macro definitions we don't evaluate the arguments
if the corresponding log level is not enabled.
This behaviour was accidently removed by the patch from
COUCHDB-1054.
Modified:
couchdb/branches/1.1.x/src/couchdb/couch_db.hrl
couchdb/branches/1.1.x/src/couchdb/couch_log.erl
Modified: couchdb/branches/1.1.x/src/couchdb/couch_db.hrl
URL:
http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_db.hrl?rev=1143376&r1=1143375&r2=1143376&view=diff
==============================================================================
--- couchdb/branches/1.1.x/src/couchdb/couch_db.hrl (original)
+++ couchdb/branches/1.1.x/src/couchdb/couch_db.hrl Wed Jul 6 12:27:15 2011
@@ -25,8 +25,20 @@
-define(DEFAULT_ATTACHMENT_CONTENT_TYPE, <<"application/octet-stream">>).
--define(LOG_DEBUG(Format, Args), couch_log:debug(Format, Args)).
--define(LOG_INFO(Format, Args), couch_log:info(Format, Args)).
+-define(LOG_DEBUG(Format, Args),
+ case couch_log:debug_on() of
+ true ->
+ couch_log:debug(Format, Args);
+ false -> ok
+ end).
+
+-define(LOG_INFO(Format, Args),
+ case couch_log:info_on() of
+ true ->
+ couch_log:info(Format, Args);
+ false -> ok
+ end).
+
-define(LOG_ERROR(Format, Args), couch_log:error(Format, Args)).
-record(rev_info,
Modified: couchdb/branches/1.1.x/src/couchdb/couch_log.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_log.erl?rev=1143376&r1=1143375&r2=1143376&view=diff
==============================================================================
--- couchdb/branches/1.1.x/src/couchdb/couch_log.erl (original)
+++ couchdb/branches/1.1.x/src/couchdb/couch_log.erl Wed Jul 6 12:27:15 2011
@@ -25,22 +25,12 @@
-define(LEVEL_TMI, 0).
debug(Format, Args) ->
- case debug_on() of
- false ->
- ok;
- true ->
- {ConsoleMsg, FileMsg} = get_log_messages(self(), debug, Format, Args),
- gen_event:sync_notify(error_logger, {couch_debug, ConsoleMsg, FileMsg})
- end.
+ {ConsoleMsg, FileMsg} = get_log_messages(self(), debug, Format, Args),
+ gen_event:sync_notify(error_logger, {couch_debug, ConsoleMsg, FileMsg}).
info(Format, Args) ->
- case info_on() of
- false ->
- ok;
- true ->
- {ConsoleMsg, FileMsg} = get_log_messages(self(), info, Format, Args),
- gen_event:sync_notify(error_logger, {couch_info, ConsoleMsg, FileMsg})
- end.
+ {ConsoleMsg, FileMsg} = get_log_messages(self(), info, Format, Args),
+ gen_event:sync_notify(error_logger, {couch_info, ConsoleMsg, FileMsg}).
error(Format, Args) ->
{ConsoleMsg, FileMsg} = get_log_messages(self(), error, Format, Args),
