improved Mojolicious to be able to detect the current operating mode …

…from the PLACK_ENV environment variable
mojolicious · May 8, 2013 · 4964945 · 4964945
1 parent 911fcc8
commit 4964945
Show file tree

Hide file tree

Showing 53 changed files with 30 additions and 59 deletions.
diff --git a/Changes b/Changes
@@ -16,6 +16,8 @@
   - Reduced idle CPU usage of Mojo::IOLoop.
   - Increased default lock_timeout from 0.5 to 1 second in
     Mojo::Server::Prefork and Mojo::Server::Hypnotoad.
+  - Improved Mojolicious to be able to detect the current operating mode from
+    the PLACK_ENV environment variable.
   - Improved Mojo::IOLoop performance by reducing stream timeout precision
     from 0.5 to 1 second.
   - Improved Mojo::DOM::HTML performance.

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -22,7 +22,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 };
@@ -257,10 +257,11 @@ L<Mojolicious::Controller>.
   my $mode = $app->mode;
   $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>.
+The operating mode for your application, defaults to a value from the
+MOJO_MODE and PLACK_ENV environment variables 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/lib/Mojolicious/Commands.pm b/lib/Mojolicious/Commands.pm
@@ -11,8 +11,8 @@ These options are available for all commands:
     -h, --help          Get more information on a specific command.
         --home <path>   Path to your applications home directory, defaults to
                         the value of MOJO_HOME or auto detection.
-    -m, --mode <name>   Run mode of your application, defaults to the value
-                        of MOJO_MODE or "development".
+    -m, --mode <name>   Run mode of your application, defaults to the value of
+                        MOJO_MODE/PLACK_ENV or "development".
 
 See '$0 help COMMAND' for more information on a specific command.
 EOF

diff --git a/lib/Mojolicious/Lite.pm b/lib/Mojolicious/Lite.pm
@@ -914,8 +914,9 @@ changing the L<Mojolicious> operating mode.
   app->start;
 
 The default operating mode will usually be C<development> and can be changed
-with command line options or the MOJO_MODE environment variable. A mode other
-than C<development> will raise the log level from C<debug> to C<info>.
+with command line options or the MOJO_MODE and PLACK_ENV environment
+variables. A mode other than C<development> will raise the log level from
+C<debug> to C<info>.
 
   $ ./myapp.pl daemon -m production
 

diff --git a/t/mojo/app.t b/t/mojo/app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/delay.t b/t/mojo/delay.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable libev
 BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More;

diff --git a/t/mojo/hypnotoad.t b/t/mojo/hypnotoad.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/ioloop_ipv6.t b/t/mojo/ioloop_ipv6.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable libev
 BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More;

diff --git a/t/mojo/ioloop_tls.t b/t/mojo/ioloop_tls.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/loader.t b/t/mojo/loader.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable libev
 BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More;

diff --git a/t/mojo/morbo.t b/t/mojo/morbo.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/prefork.t b/t/mojo/prefork.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/reactor_ev.t b/t/mojo/reactor_ev.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6
 BEGIN { $ENV{MOJO_NO_IPV6} = 1 }
 
 use Test::More;

diff --git a/t/mojo/reactor_poll.t b/t/mojo/reactor_poll.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/user_agent.t b/t/mojo/user_agent.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6, TLS and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = $ENV{MOJO_NO_TLS} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/user_agent_online.t b/t/mojo/user_agent_online.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable libev and proxy detection
 BEGIN {
   $ENV{MOJO_PROXY}   = 0;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/user_agent_tls.t b/t/mojo/user_agent_tls.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/websocket_proxy.t b/t/mojo/websocket_proxy.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/app.t b/t/mojolicious/app.t
@@ -1,7 +1,7 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
+  $ENV{PLACK_ENV}    = undef;
   $ENV{MOJO_MODE}    = 'development';
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';
@@ -26,6 +26,18 @@ use Test::Mojo;
     'works', 'right result');
 }
 
+# Mode detection
+{
+  local $ENV{MOJO_MODE} = undef;
+  local $ENV{PLACK_ENV} = 'something';
+  is(Test::Mojo->new('MojoliciousTest')->app->mode, 'something', 'right mode');
+}
+{
+  local $ENV{MOJO_MODE} = 'else';
+  local $ENV{PLACK_ENV} = 'something';
+  is(Test::Mojo->new('MojoliciousTest')->app->mode, 'else', 'right mode');
+}
+
 my $t = Test::Mojo->new('MojoliciousTest');
 
 # Application is already available

diff --git a/t/mojolicious/caching_lite_app.t b/t/mojolicious/caching_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/charset_lite_app.t b/t/mojolicious/charset_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/command.t b/t/mojolicious/command.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable libev
 BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
 
 use Test::More;

diff --git a/t/mojolicious/commands.t b/t/mojolicious/commands.t
@@ -1,7 +1,9 @@
 use Mojo::Base -strict;
 
-# Disable libev
-BEGIN { $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll' }
+BEGIN {
+  $ENV{PLACK_ENV}    = undef;
+  $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';
+}
 
 use Test::More;
 

diff --git a/t/mojolicious/dispatcher_lite_app.t b/t/mojolicious/dispatcher_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/embedded_app.t b/t/mojolicious/embedded_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'testing';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/embedded_lite_app.t b/t/mojolicious/embedded_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'testing';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/exception_lite_app.t b/t/mojolicious/exception_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'development';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/external_app.t b/t/mojolicious/external_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'testing';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/external_lite_app.t b/t/mojolicious/external_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'testing';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/group_lite_app.t b/t/mojolicious/group_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/json_config_lite_app.t b/t/mojolicious/json_config_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'development';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/json_config_mode_lite_app.t b/t/mojolicious/json_config_mode_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'testing';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/layouted_lite_app.t b/t/mojolicious/layouted_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'development';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/longpolling_lite_app.t b/t/mojolicious/longpolling_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/multipath_lite_app.t b/t/mojolicious/multipath_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/ojo.t b/t/mojolicious/ojo.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6, libev and proxy detection
 BEGIN {
   $ENV{MOJO_MODE}    = 'development';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/pod_renderer_lite_app.t b/t/mojolicious/pod_renderer_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/production_app.t b/t/mojolicious/production_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'production';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/rebased_lite_app.t b/t/mojolicious/rebased_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/restful_lite_app.t b/t/mojolicious/restful_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/static_lite_app.t b/t/mojolicious/static_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/tag_helper_lite_app.t b/t/mojolicious/tag_helper_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';

diff --git a/t/mojolicious/testing_app.t b/t/mojolicious/testing_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_MODE}    = 'testing';
   $ENV{MOJO_NO_IPV6} = 1;

diff --git a/t/mojolicious/tls_lite_app.t b/t/mojolicious/tls_lite_app.t
@@ -1,6 +1,5 @@
 use Mojo::Base -strict;
 
-# Disable IPv6 and libev
 BEGIN {
   $ENV{MOJO_NO_IPV6} = 1;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';