Only use log directory if it is in fact a directory

mojolicious · Nov 8, 2014 · 7c2c2ee · 7c2c2ee
1 parent b4a2919
commit 7c2c2ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -171,7 +171,7 @@ sub new {
   # Check if we have a log directory
   my $mode = $self->mode;
   $self->log->path($home->rel_file("log/$mode.log"))
-    if -w $home->rel_file('log');
+    if -d $home->rel_dir('log') and -w _;
 
   $self->plugin($_)
     for qw(HeaderCondition DefaultHelpers TagHelpers EPLRenderer EPRenderer);

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -20,6 +20,8 @@ is $@, qq{Plugin "does_not_exist" missing, maybe you need to install it?\n},
 # Default
 app->defaults(default => 23);
 
+is app->log->handle, \*STDERR, 'log handle is correct';
+
 # Secret
 my $log = '';
 my $cb = app->log->on(message => sub { $log .= pop });

diff --git a/t/mojolicious/log b/t/mojolicious/log