added support for PLACK_ENV as an alternative to MOJO_MODE

mojolicious · Apr 14, 2013 · b98f89f · b98f89f
1 parent b1dfa58
commit b98f89f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -21,7 +21,7 @@ has commands => sub {
   return $commands;
 };
 has controller_class => 'Mojolicious::Controller';
-has mode => sub { $ENV{MOJO_MODE} || 'development' };
+has mode => sub { $ENV{MOJO_MODE} || $ENV{PLACK_ENV} || 'development' };
 has moniker  => sub { decamelize ref shift };
 has plugins  => sub { Mojolicious::Plugins->new };
 has renderer => sub { Mojolicious::Renderer->new };
@@ -253,9 +253,10 @@ L<Mojolicious::Controller>.
   $app     = $app->mode('production');
 
 The operating mode for your application, defaults to the value of the
-MOJO_MODE environment variable or C<development>. You can also add per
-mode logic to your application by defining methods named C<${mode}_mode> in
-the application class, which will be called right before C<startup>.
+MOJO_MODE environment variable, the value of the PLACK_ENV environment
+variable or C<development>. You can also add per mode logic to your
+application by defining methods named C<${mode}_mode> in the application
+class, which will be called right before C<startup>.
 
   sub development_mode {
     my $self = shift;

diff --git a/t/mojolicious/app.t b/t/mojolicious/app.t
@@ -26,6 +26,14 @@ use Test::Mojo;
     'works', 'right result');
 }
 
+# Mode set with PLACK_ENV
+{
+  local $ENV{MOJO_MODE} = '';
+  local $ENV{PLACK_ENV} = 'whatever';
+  is(Test::Mojo->new('MojoliciousConfigTest')->app->config->{it},
+    'works', 'right result');
+}
+
 my $t = Test::Mojo->new('MojoliciousTest');
 
 # Application is already available