Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r954242 - in /couchdb/branches/0.10.x/src/couchdb:
 couch_db.hrl
 couch_log.erl
Date: Sun, 13 Jun 2010 15:21:13 -0000
To: commits@couchdb.apache.org
From: kocolosk@apache.org
Message-Id: <20100613152113.5C50D2388A3C@eris.apache.org>

Author: kocolosk
Date: Sun Jun 13 15:21:06 2010
New Revision: 954242

URL: http://svn.apache.org/viewvc?rev=954242&view=rev
Log:
backport of synchronous logging, COUCHDB-761.  Patch by Randall Leeds.

This patch fixes a bug where calls to get the log level could time
out, resulting in an unexpected {ref(), integer()} message in the
client's mailbox.  This would crash some gen_servers that did not
expect the message.

This backport also includes r954240, the hack for logging during
make check.

Modified:
    couchdb/branches/0.10.x/src/couchdb/couch_db.hrl
    couchdb/branches/0.10.x/src/couchdb/couch_log.erl

Modified: couchdb/branches/0.10.x/src/couchdb/couch_db.hrl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/couch_db.hrl?rev=954242&r1=954241&r2=954242&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/couchdb/couch_db.hrl (original)
+++ couchdb/branches/0.10.x/src/couchdb/couch_db.hrl Sun Jun 13 15:21:06 2010
@@ -24,18 +24,23 @@
 
 -define(LOG_DEBUG(Format, Args),
     case couch_log:debug_on() of
-        true -> error_logger:info_report(couch_debug, {Format, Args});
+        true ->
+            gen_event:sync_notify(error_logger,
+                {self(), couch_debug, {Format, Args}});
         false -> ok
     end).
 
 -define(LOG_INFO(Format, Args),
     case couch_log:info_on() of
-        true -> error_logger:info_report(couch_info, {Format, Args});
+        true ->
+            gen_event:sync_notify(error_logger,
+                {self(), couch_info, {Format, Args}});
         false -> ok
     end).
 
 -define(LOG_ERROR(Format, Args),
-    error_logger:error_report(couch_error, {Format, Args})).
+    gen_event:sync_notify(error_logger,
+            {self(), couch_error, {Format, Args}})).
 
 
 -record(rev_info,

Modified: couchdb/branches/0.10.x/src/couchdb/couch_log.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/couch_log.erl?rev=954242&r1=954241&r2=954242&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/couchdb/couch_log.erl (original)
+++ couchdb/branches/0.10.x/src/couchdb/couch_log.erl Sun Jun 13 15:21:06 2010
@@ -50,14 +50,23 @@ init([]) ->
         fun("log", "file") ->
             ?MODULE:stop();
         ("log", "level") ->
+            ?MODULE:stop();
+        ("log", "include_sasl") ->
             ?MODULE:stop()
         end),
 
     Filename = couch_config:get("log", "file", "couchdb.log"),
-    Level = couch_config:get("log", "level", "info"),
+    Level = level_integer(list_to_atom(couch_config:get("log", "level", "info"))),
+    Sasl = list_to_atom(couch_config:get("log", "include_sasl", "true")),
+
+    case ets:info(?MODULE) of
+    undefined -> ets:new(?MODULE, [named_table]);
+    _ -> ok
+    end,
+    ets:insert(?MODULE, {level, Level}),
 
     {ok, Fd} = file:open(Filename, [append]),
-    {ok, {Fd, level_integer(list_to_atom(Level))}}.
+    {ok, {Fd, Level, Sasl}}.
 
 debug_on() ->
     get_level_integer() =< ?LEVEL_DEBUG.
@@ -72,29 +81,35 @@ get_level() ->
     level_atom(get_level_integer()).
 
 get_level_integer() ->
-    catch gen_event:call(error_logger, couch_log, get_level_integer).
+    try
+        ets:lookup_element(?MODULE, level, 2)
+    catch error:badarg ->
+        ?LEVEL_ERROR
+    end.
 
 set_level_integer(Int) ->
     gen_event:call(error_logger, couch_log, {set_level_integer, Int}).
 
-handle_event({error_report, _, {Pid, couch_error, {Format, Args}}}, {Fd, _LogLevel}=State) ->
-    log(Fd, Pid, error, Format, Args),
-    {ok, State};
-handle_event({error_report, _, {Pid, _, _}}=Event, {Fd, _LogLevel}=State) ->
-    log(Fd, Pid, error, "~p", [Event]),
-    {ok, State};
-handle_event({error, _, {Pid, Format, Args}}, {Fd, _LogLevel}=State) ->
+handle_event({Pid, couch_error, {Format, Args}}, {Fd, _LogLevel, _Sasl}=State) ->
     log(Fd, Pid, error, Format, Args),
     {ok, State};
-handle_event({info_report, _, {Pid, couch_info, {Format, Args}}}, {Fd, LogLevel}=State)
+handle_event({Pid, couch_info, {Format, Args}}, {Fd, LogLevel, _Sasl}=State)
 when LogLevel =< ?LEVEL_INFO ->
     log(Fd, Pid, info, Format, Args),
     {ok, State};
-handle_event({info_report, _, {Pid, couch_debug, {Format, Args}}}, {Fd, LogLevel}=State)
+handle_event({Pid, couch_debug, {Format, Args}}, {Fd, LogLevel, _Sasl}=State)
 when LogLevel =< ?LEVEL_DEBUG ->
     log(Fd, Pid, debug, Format, Args),
     {ok, State};
-handle_event({_, _, {Pid, _, _}}=Event, {Fd, LogLevel}=State)
+handle_event({error_report, _, {Pid, _, _}}=Event, {Fd, _LogLevel, Sasl}=State)
+when Sasl =/= false ->
+    log(Fd, Pid, error, "~p", [Event]),
+    {ok, State};
+handle_event({error, _, {Pid, Format, Args}}, {Fd, _LogLevel, Sasl}=State)
+when Sasl =/= false ->
+    log(Fd, Pid, error, Format, Args),
+    {ok, State};
+handle_event({_, _, {Pid, _, _}}=Event, {Fd, LogLevel, _Sasl}=State)
 when LogLevel =< ?LEVEL_TMI ->
     % log every remaining event if tmi!
     log(Fd, Pid, tmi, "~p", [Event]),
@@ -102,10 +117,9 @@ when LogLevel =< ?LEVEL_TMI ->
 handle_event(_Event, State) ->
     {ok, State}.
 
-handle_call(get_level_integer, {_Fd, LogLevel}=State) ->
-    {ok, LogLevel, State};
-handle_call({set_level_integer, NewLevel}, {Fd, _LogLevel}) ->
-    {ok, ok, {Fd, NewLevel}}.
+handle_call({set_level_integer, NewLevel}, {Fd, _LogLevel, Sasl}) ->
+    ets:insert(?MODULE, {level, NewLevel}),
+    {ok, ok, {Fd, NewLevel, Sasl}}.
 
 handle_info(_Info, State) ->
     {ok, State}.
@@ -113,7 +127,7 @@ handle_info(_Info, State) ->
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-terminate(_Arg, {Fd, _LoggingLevel}) ->
+terminate(_Arg, {Fd, _LoggingLevel, _Sasl}) ->
     file:close(Fd).
 
 log(Fd, Pid, Level, Format, Args) ->