fixed encoding bug in Mojo::Log (closes #495)

mojolicious · May 24, 2013 · de42dd6 · de42dd6
1 parent 7718f7b
commit de42dd6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,7 @@
 
+4.05  2013-05-24
+  - Fixed encoding bug in Mojo::Log.
+
 4.04  2013-05-23
   - Added WebSocket subprotocol support to Mojo::UserAgent::Transactor.
 

diff --git a/lib/Mojo/Log.pm b/lib/Mojo/Log.pm
@@ -63,7 +63,7 @@ sub _message {
 
   flock $handle, LOCK_EX;
   croak "Can't write to log: $!"
-    unless defined $handle->syswrite($self->format($level, @lines));
+    unless $handle->print($self->format($level, @lines));
   flock $handle, LOCK_UN;
 }
 

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -41,7 +41,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Top Hat';
-our $VERSION  = '4.04';
+our $VERSION  = '4.05';
 
 sub AUTOLOAD {
   my $self = shift;

diff --git a/t/mojo/log.t b/t/mojo/log.t
@@ -4,21 +4,38 @@ use Test::More;
 use File::Spec::Functions 'catdir';
 use File::Temp 'tempdir';
 use Mojo::Log;
-use Mojo::Util 'slurp';
+use Mojo::Util qw(decode slurp);
 
 # Logging to file
 my $dir = tempdir CLEANUP => 1;
 my $path = catdir $dir, 'test.log';
 my $log = Mojo::Log->new(level => 'error', path => $path);
 $log->error('Just works.');
-$log->fatal('Works too.');
+$log->fatal('I ♥ Mojolicious.');
 $log->debug('Does not work.');
 undef $log;
-my $content = slurp $path;
-like $content,   qr/\[.*\] \[error\] Just works\.\n/,    'has error message';
-like $content,   qr/\[.*\] \[fatal\] Works too\.\n/,     'has fatal message';
+my $content = decode 'UTF-8', slurp($path);
+like $content, qr/\[.*\] \[error\] Just works\.\n/, 'right error message';
+like $content, qr/\[.*\] \[fatal\] I ♥ Mojolicious\.\n/,
+  'right fatal message';
 unlike $content, qr/\[.*\] \[debug\] Does not work\.\n/, 'no debug message';
 
+# Logging to STDERR
+my $buffer = '';
+{
+  open my $handle, '>', \$buffer;
+  local *STDERR = $handle;
+  my $log = Mojo::Log->new;
+  $log->error('Just works.');
+  $log->fatal('I ♥ Mojolicious.');
+  $log->debug('Works too.');
+}
+$content = decode 'UTF-8', $buffer;
+like $content, qr/\[.*\] \[error\] Just works\.\n/, 'right error message';
+like $content, qr/\[.*\] \[fatal\] I ♥ Mojolicious\.\n/,
+  'right fatal message';
+like $content, qr/\[.*\] \[debug\] Works too\.\n/, 'right debug message';
+
 # Formatting
 $log = Mojo::Log->new;
 like $log->format(debug => 'Test 123.'), qr/^\[.*\] \[debug\] Test 123\.\n$/,