rsence-pre 2.1.0.19 → 2.1.0.20

data/VERSION

@@ -1 +1 @@
-2.1.0.19.pre
+2.1.0.20.pre

data/lib/session/sessionmanager.rb

@@ -75,7 +75,7 @@ module RSence
         # the time, when the session will time out
         :timeout    =>  timeout,
         
-        :plugin_incr => 0,
+        :plugin_incr => @plugins.incr,
         
         # session id, used internally
         :ses_id     =>  ses_id,
@@ -182,6 +182,7 @@ module RSence
       ses_data[:timeout] = timeout
       ses_data[:ses_key] = ses_key
       ses_data[:cookie_key] = cookie_key
+      ses_data[:plugin_incr] = @plugins.incr
       ses_id = new_ses_id( cookie_key, ses_key, timeout )
       ses_data[:ses_id] = ses_id
       @sessions[ ses_id ] = ses_data
@@ -312,6 +313,9 @@ module RSence
         
           # binds the new cookie key to the old session data
           @sessions[ses_id][:cookie_key] = cookie_key
+          
+          
+          msg.session[:plugin_incr] = @plugins.incr
         
           # Sets the restored_session flag of msg to true
           # It signals plugins to re-set data

data/lib/session/sessionstorage.rb

@@ -207,16 +207,22 @@ module RSence
       @db[:rsence_session].all do |ses_row|
         ses_id = ses_row[:id]
         ses_data_dump = ses_row[:ses_data]
-      
+        
         if ses_data_dump == nil
           @db[:rsence_session].filter(:id => ses_id).delete
           @db[:rsence_uploads].filter(:ses_id => ses_id).delete
         else
-          ses_data = Marshal.load( ses_data_dump )
-          ses_key = ses_data[:ses_key]
-          @sessions[ses_id] = ses_data
-          @session_keys[ ses_key ] = ses_id
-          @session_cookie_keys[ ses_data[:cookie_key] ] = ses_id
+          begin
+            ses_data = Marshal.load( ses_data_dump )
+            ses_key = ses_data[:ses_key]
+            @sessions[ses_id] = ses_data
+            @session_keys[ ses_key ] = ses_id
+            @session_cookie_keys[ ses_data[:cookie_key] ] = ses_id
+          rescue => e
+            warn "Unable to restore session id: #{ses_id}, error: #{e.inspect}"
+            @db[:rsence_session].filter(:id => ses_id).delete
+            @db[:rsence_uploads].filter(:ses_id => ses_id).delete
+          end
         end
       end
       db_close
@@ -290,7 +296,7 @@ module RSence
       @sessions.delete( ses_id )
     
       # Removes all ticket-based storage bound to the session
-      @plugins[:ticketservices].expire_ses( ses_id ) if @plugins
+      @plugins[:ticket].expire_ses_id( ses_id ) if @plugins
     
       # target -> source cleanup
       if @clone_sources.has_key?( ses_id )

data/lib/transporter/transporter.rb

@@ -38,8 +38,6 @@ module RSence
     def initialize
       @config = RSence.config[:transporter_conf]
       @accept_req = false
-      @valuemanager = ValueManager.new
-      @sessions = SessionManager.new( self )
       core_pkgs = {
         :core => [:transporter, :session_storage, :session_manager, :value_manager]
       }
@@ -51,6 +49,8 @@ module RSence
         :resolved_deps => core_pkgs[:core],
         :resolved_categories => core_pkgs
       })
+      @valuemanager = ValueManager.new
+      @sessions = SessionManager.new( self )
       if RSence.config[:session_conf][:reset_sessions]
         puts "Resetting all sessions..."
         @sessions.reset_sessions()

data/plugins/client_pkg/info.yaml

@@ -3,7 +3,7 @@
 title: Client Resource Package
 
 # The human-readable version of the package
-version: 2.0.0
+version: 2.1.0
 
 # A brief description of the package (rdoc formatting supported)
 description: |
@@ -17,7 +17,7 @@ description: |
 reloadable: false
 
 # System version requirement.
-sys_version: '>= 2.0.0'
+sys_version: '>= 2.1.0'
 
 category: :system
 

data/plugins/ticket/info.yaml

@@ -3,7 +3,7 @@
 title: Ticket services
 
 # The human-readable version of the package
-version: 2.0.0
+version: 2.1.0
 
 # A brief description of the package (rdoc formatting supported)
 description: |
@@ -13,7 +13,7 @@ description: |
 reloadable: false
 
 # System version requirement.
-sys_version: '>= 2.0.0'
+sys_version: '>= 2.1.0'
 
 category: :system
 

data/plugins/ticket/ticket.rb

@@ -179,9 +179,14 @@ class TicketPlugin < Plugin
     @ticketserve.serve( msg, content, format, type )
   end
   
-  # @private Removes data used by the session
+  # @private Removes data used by the session, takes session id
+  def expire_ses_id( ses_id )
+    @ticketserve.expire_ses( ses_id )
+  end
+  
+  # @private Removes data used by the session, takes msg
   def expire_ses( msg )
-    @ticketserve.expire_ses( msg.ses_id )
+    expire_ses_id( msg.ses_id )
   end
   
   # Sets a custom favicon for RSence

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 79
   prerelease: false
   segments: 
   - 2
   - 1
   - 0
-  - 19
-  version: 2.1.0.19
+  - 20
+  version: 2.1.0.20
 platform: ruby
 authors: 
 - Riassence Inc.