Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (athena.apache.org: domain of paul.joseph.davis@gmail.com
 designates 209.85.220.180 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :content-type:content-transfer-encoding;
        b=b7Nne7VzIAA50MdeP8W4N5SJYpNx6uHJ2QmF0eukMKQdlbpTEQaII016VTzBKb2HJP
         MTa0JbgEk9wLw595LEs9KX16rNHH1Za9zCOh3DQ9d2EsU/YOhw9eiMBlZZP20sFOfVEp
         kfzhiBpFlDSg+wJ4QMt7H5+J9y4zDNRv+AeW8=
MIME-Version: 1.0
In-Reply-To: <BANLkTinMwOS5nKHG7RiiiN2hn2cT325m+A@mail.gmail.com>
References: <20110511142622.09D852388A29@eris.apache.org>
 <BANLkTinMwOS5nKHG7RiiiN2hn2cT325m+A@mail.gmail.com>
From: Paul Davis <paul.joseph.davis@gmail.com>
Date: Wed, 11 May 2011 10:50:56 -0400
Message-ID: <BANLkTim0_Ab8o=2EkDpfucYeU4wEz7d0vw@mail.gmail.com>
Subject: Re: svn commit: r1101896 - /couchdb/trunk/src/couchdb/couch_log.erl
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

That should be fine I think. Theoretically the only thing getting
through before was non-unicode stuff which should pass through
unicode:characters_to_binary just fine, right?

On Wed, May 11, 2011 at 10:27 AM, Filipe David Manana
<fdmanana@apache.org> wrote:
> If no one has an objection, I would apply this to 1.1.x as well, since
> it suffers the same issue.
>
> On Wed, May 11, 2011 at 3:26 PM, =A0<fdmanana@apache.org> wrote:
>> Author: fdmanana
>> Date: Wed May 11 14:26:21 2011
>> New Revision: 1101896
>>
>> URL: http://svn.apache.org/viewvc?rev=3D1101896&view=3Drev
>> Log:
>> Fix logger crash when messages have unicode characters
>>
>> This closes COUCHDB-1158. Thanks Dale Harvey.
>>
>> Modified:
>> =A0 =A0couchdb/trunk/src/couchdb/couch_log.erl
>>
>> Modified: couchdb/trunk/src/couchdb/couch_log.erl
>> URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_log.er=
l?rev=3D1101896&r1=3D1101895&r2=3D1101896&view=3Ddiff
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
>> --- couchdb/trunk/src/couchdb/couch_log.erl (original)
>> +++ couchdb/trunk/src/couchdb/couch_log.erl Wed May 11 14:26:21 2011
>> @@ -167,10 +167,10 @@ log(#state{fd =3D Fd}, ConsoleMsg, FileMsg
>> =A0 =A0 ok =3D io:put_chars(Fd, FileMsg).
>>
>> =A0get_log_messages(Pid, Level, Format, Args) ->
>> - =A0 =A0ConsoleMsg =3D io_lib:format(
>> - =A0 =A0 =A0 =A0"[~s] [~p] " ++ Format ++ "~n", [Level, Pid | Args]),
>> + =A0 =A0ConsoleMsg =3D unicode:characters_to_binary(io_lib:format(
>> + =A0 =A0 =A0 =A0"[~s] [~p] " ++ Format ++ "~n", [Level, Pid | Args])),
>> =A0 =A0 FileMsg =3D ["[", httpd_util:rfc1123_date(), "] ", ConsoleMsg],
>> - =A0 =A0{iolist_to_binary(ConsoleMsg), iolist_to_binary(FileMsg)}.
>> + =A0 =A0{ConsoleMsg, iolist_to_binary(FileMsg)}.
>>
>> =A0read(Bytes, Offset) ->
>> =A0 =A0 LogFileName =3D couch_config:get("log", "file"),
>>
>>
>>
>
>
>
> --
> Filipe David Manana,
> fdmanana@gmail.com, fdmanana@apache.org
>
> "Reasonable men adapt themselves to the world.
> =A0Unreasonable men adapt the world to themselves.
> =A0That's why all progress depends on unreasonable men."
>