rsence-pre 2.1.0.17 → 2.1.0.18

data/VERSION

@@ -1 +1 @@
-2.1.0.17.pre
+2.1.0.18.pre

data/lib/session/sessionmanager.rb

@@ -173,7 +173,7 @@ module RSence
     end
   
     def clone_ses( msg, old_data, old_id, old_key, ses_seed )
-      ses_data = Marshal.restore( Marshal.dump( old_data ) )
+      ses_data = Marshal.load( Marshal.dump( old_data ) )
       old_data[:timeout] = Time.now.to_i + @config[:cloned_session_expires_in]
       timeout = Time.now.to_i + @config[:timeout_secs]
       cookie_key = @randgen.gen_many(@config[:cookie_key_multiplier]).join('')

data/lib/session/sessionstorage.rb

@@ -181,13 +181,6 @@ module RSence
       ## Used for future upgrades:
       # version = table_version
     
-      if @config[:reset_sessions]
-        puts "Resetting all sessions..."
-        reset_sessions()
-      else
-        restore_sessions()
-      end
-    
       return true
     end
   
@@ -219,7 +212,7 @@ module RSence
           @db[:rsence_session].filter(:id => ses_id).delete
           @db[:rsence_uploads].filter(:ses_id => ses_id).delete
         else
-          ses_data = Marshal.restore( ses_data_dump )
+          ses_data = Marshal.load( ses_data_dump )
           ses_key = ses_data[:ses_key]
           @sessions[ses_id] = ses_data
           @session_keys[ ses_key ] = ses_id

data/lib/transporter/transporter.rb

@@ -51,6 +51,13 @@ module RSence
         :resolved_deps => core_pkgs[:core],
         :resolved_categories => core_pkgs
       })
+      if RSence.config[:session_conf][:reset_sessions]
+        puts "Resetting all sessions..."
+        @sessions.reset_sessions()
+      else
+        @sessions.restore_sessions()
+      end
+
       if RSence.launch_pid != Process.pid
         Process.kill( 'TERM', RSence.launch_pid )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: false
   segments: 
   - 2
   - 1
   - 0
-  - 17
-  version: 2.1.0.17
+  - 18
+  version: 2.1.0.18
 platform: ruby
 authors: 
 - Riassence Inc.