Check parameters to session.new. Cleanups

lib/sbsm/app.rb

@@ -28,13 +28,11 @@
 require 'sbsm/cgi'
 require 'cgi/drbsession'
 require 'sbsm/drbserver'
-
 module SBSM
   ###
   # App a base class for Webrick server
   class App < SBSM::DRbServer
     include DRbUndumped
-    SESSION_COOKIE_NAME    = '_session_id'
     PERSISTENT_COOKIE_NAME = "cookie-persistent-sbsm-1.3.1"
     SBSM.info "PERSISTENT_COOKIE_NAME #{PERSISTENT_COOKIE_NAME}"
 
@@ -92,12 +90,12 @@ def initialize(app:, validator:, trans_handler:, persistence_layer: nil)
     def call(env) ## mimick sbsm/lib/app.rb
       request = Rack::Request.new(env)
       response = Rack::Response.new
-      SBSM.info "cookies are #{request.cookies}"
       if request.cookies[PERSISTENT_COOKIE_NAME] && request.cookies[PERSISTENT_COOKIE_NAME].length > 1
         session_id = request.cookies[PERSISTENT_COOKIE_NAME]
       else
         session_id = rand((2**(0.size * 8 -2) -1)*10240000000000).to_s(16)
       end
+      SBSM.info "cookies are #{request.cookies} for session_id #{session_id}"
       file_name = File.expand_path(File.join('doc', request.path))
       if File.file?(file_name)
         if /css/i.match(File.basename(file_name))
@@ -126,7 +124,7 @@ def call(env) ## mimick sbsm/lib/app.rb
       res = @proxy.drb_process(self, request)
       response.write res
       response.headers['Content-Type'] ||= 'text/html; charset=utf-8'
-      response.set_cookie(SESSION_COOKIE_NAME, session_id)
+      response.set_cookie(PERSISTENT_COOKIE_NAME, session_id)
       @proxy.cookie_input.each{|key, value| response.set_cookie(key, value) }
       SBSM.info "finish session_id #{session_id}: header #{response.headers}"
       response.finish

lib/sbsm/drbserver.rb

@@ -32,6 +32,7 @@
 require 'thread'
 require 'digest/md5'
 require 'sbsm/logger'
+require 'sbsm/validator'
 
 module SBSM
 	class DRbServer < SimpleDelegator
@@ -80,7 +81,7 @@ def _admin(src, result, priority=0)
 			t
 		end
 		def async(&block)
-      binding.pry
+      SBSM.info "pry needed?"
 			@async.add(Thread.new(&block))
 		end
 		def cap_max_sessions(now = Time.now)
@@ -146,26 +147,24 @@ def run_cleaner
 				}
 			}
 		end
-    def dump_info
-      SBSM.info @sessions
-    end
 		def unknown_user
 			self::class::UNKNOWN_USER.new
 		end
-		def [](key)
-			@mutex.synchronize {
-				unless((s = @sessions[key]) && !s.expired?)
-					args = [key, self]
-					if(klass = self::class::VALIDATOR)
-						args.push(klass.new)
-					end
-          SBSM.info "add key #{key} args #{args.compact}" #  #{caller.join("\n")}"
-					s = @sessions[key] = self::class::SESSION.new(*args.compact)
-				end
-				s.reset()
-				s.touch()
-				s
-			}
-		end
+    def [](key)
+      @mutex.synchronize {
+        unless((s = @sessions[key]) && !s.expired?)
+          args = [key, self]
+          if(klass = self::class::VALIDATOR)
+            args.push(klass.new)
+          else
+            args.push SBSM::Validator
+          end
+          s = @sessions[key] = self::class::SESSION.new(*args.compact)
+        end
+        s.reset()
+        s.touch()
+        s
+      }
+    end
 	end
 end

lib/sbsm/logger.rb

@@ -24,7 +24,6 @@
 
 require 'chrono_logger'
 require 'sbsm/version'
-
 module SBSM
   @@logger = ChronoLogger.new("/tmp/sbsm_#{VERSION}.log.%Y%m%d")
   # a simple logger, which makes it easy to compare the timing of the entries

lib/sbsm/redirector.rb

@@ -6,7 +6,7 @@
 module SBSM
   module Redirector
     def http_headers
-      require 'pry'; binding.pry
+      SBSM.info "pry needed?"
       if(redirect?)
         @redirected = @state.redirected = true
         event, *args = @state.direct_event