improved overall performance by deserializing sessions only on demand

mojolicious · Nov 27, 2014 · 350478b · 350478b
1 parent c24e48a
commit 350478b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
 5.67  2014-11-27
+  - Improved overall performance by deserializing sessions only on demand.
   - Fixed bug where embedded applications would deserialize sessions twice.
 
 5.66  2014-11-26

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -89,8 +89,6 @@ sub defaults { Mojo::Util::_stash(defaults => @_) }
 sub dispatch {
   my ($self, $c) = @_;
 
-  my $stash = $c->stash;
-  $self->sessions->load($c) unless exists $stash->{'mojo.active_session'};
   my $plugins = $self->plugins->emit_hook(before_dispatch => $c);
 
   # Try to find a static file
@@ -99,6 +97,7 @@ sub dispatch {
     unless $tx->res->code;
 
   # Start timer (ignore static files)
+  my $stash = $c->stash;
   unless ($stash->{'mojo.static'} || $stash->{'mojo.started'}) {
     my $req    = $c->req;
     my $method = $req->method;

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -255,8 +255,12 @@ sub send {
 sub session {
   my $self = shift;
 
+  my $stash = $self->stash;
+  $self->app->sessions->load($self)
+    unless exists $stash->{'mojo.active_session'};
+
   # Hash
-  my $session = $self->stash->{'mojo.session'} ||= {};
+  my $session = $stash->{'mojo.session'} ||= {};
   return $session unless @_;
 
   # Get

diff --git a/lib/Mojolicious/Sessions.pm b/lib/Mojolicious/Sessions.pm
@@ -14,7 +14,6 @@ has serialize          => sub { \&Mojo::JSON::encode_json };
 sub load {
   my ($self, $c) = @_;
 
-  return unless $c->req->headers->cookie;
   return unless my $value = $c->signed_cookie($self->cookie_name);
   $value =~ y/-/=/;
   return unless my $session = $self->deserialize->(b64_decode $value);