dango 0.4.3 → 0.4.5

data/lib/dango/controller_plugin/dango_controller_plugin.rb

@@ -19,8 +19,12 @@ module DangoControllerPlugin
     config = dango_server_config(options)
     raise("backdoor_run_drb_server is false.") if !config['server']['backdoor_run_drb_server']
     drb_uri = "druby://#{config['network']['host']}:#{config['server']['backdoor_run_drb_port']}"
-    drb_obj = DRbObject.new_with_uri(drb_uri)
-    drb_obj.__send__(method_name.to_s, arg)
+    begin
+      drb_obj = DRbObject.new_with_uri(drb_uri)
+      drb_obj.__send__(method_name.to_s, arg)
+    rescue Exception
+      raise("DRbError:#{$!.class} #{$!.message} #{$!.backtrace.inspect}")
+    end
   end
 end
 

data/lib/dango/framework_base.rb

@@ -68,7 +68,8 @@ module ErrorMessage
       "#{exception_class.class} is not Exception class"
     end
     
-    str = "#{exception_class.class}:#{exception_class.message}\n#{exception_class.backtrace.pretty_inspect}"
+    str = "#{exception_class.class}:#{exception_class.message}\n" + 
+          "#{exception_class.backtrace.pretty_inspect}"
     if code.to_s.downcase == "u" || code.to_s.downcase == "utf8"
       str = str.toutf8
     elsif code.to_s.downcase == "s" || code.to_s.downcase == "sjis"
@@ -103,6 +104,9 @@ module DangoFrameworkModule
   CommMaxDigit = 5                 # 通信の最大桁数
   MaxLenRecv   = 1024              # 通信の一度の送信バイト数
   MaxLenSend   = 1024 * 1024       # 通信の一度の送信バイト数
+#  4294967296 # 本当はuint最大値なんだけれど、policyファイルの都合で変えてある
+#  1886350440 
+#  1886350441
   
   EncodeTypeJSON = 0                  # エンコードのタイプのJSON
   EncodeTypeYAML = 1                  # エンコードのタイプのYAML
@@ -142,14 +146,14 @@ module DangoFrameworkModule
         @dango_logger = Logger.new(@log_file, @log_shift_age, @log_max_size)
         @dango_logger.level = @log_level
         def @dango_logger.format_message(severity, timestamp, msg, progname) 
-#          "#{Time.now_to_s}:#{sprintf('%1.1s', severity)}:#{progname}:#{msg}\n"
-#          "%s, [%s#%d] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), $$, severity, progname,msg2str(msg)]
           now = Time.now
           now_str = now.strftime("%Y-%m-%d %H:%M:%S.") << "%06d" % now.usec
           "%1.1s, [%s] %d:%s %s\n" % [severity, now_str, Thread.current.object_id, progname, msg]
         end
       end
+      
     end
+    
     @dango_logger
   end
 
@@ -159,17 +163,15 @@ module DangoFrameworkModule
   def dango_receive_data(sock)
     ret_data = ""
     
-#    logger.debug "dango_receive_data(#{sock})"
-    
     begin
-#      size_str = sock.readpartial(CommMaxDigit + 1)
-#      size_str = sock.sysread(CommMaxDigit + 1)
       size_str = sock.recv(CommMaxDigit + 1)
     rescue EOFError, IOError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNABORTED
       # 接続終了時の切断と思われるものはDangoFrameworkConnectionExceptionにしない
-      raise(DangoFrameworkDisconnectException, "failed to read sock for EOF reached (and so on). sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
+      raise(DangoFrameworkDisconnectException, "failed to read sock for EOF reached (and so on). " + 
+                                               "sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
     rescue
-      raise(DangoFrameworkConnectionException, "failed to read sock. sock=#{sock.inspect} toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
+      raise(DangoFrameworkConnectionException, "failed to read sock. sock=#{sock.inspect} " + 
+                                               "toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
     end
     
     if size_str == ""
@@ -189,39 +191,31 @@ module DangoFrameworkModule
     
     ## データがない場合
     if size == nil || size == 0
-      raise(DangoFrameworkConnectionException, "toid=#{Thread.current.object_id}:size=#{size}:size_str=#{size_str.inspect}") 
+      raise(DangoFrameworkConnectionException, "toid=#{Thread.current.object_id}" + 
+                                               ":size=#{size}:size_str=#{size_str.inspect}") 
     end
     
     ## データが大きすぎる場合
-    if size >= 1886350441
+    if size >= MaxLenSend
       raise(DangoFrameworkConnectionException, "too big... size=#{size}:size_str=#{size_str.inspect}")
     end
     
-#    logger.debug "size=#{size}:size_str=#{size_str.inspect}"
-    
     ret_data_orig = ""
     
     while size > 0
       read_len = MaxLenRecv > size ? size : MaxLenRecv
       begin
-#        this_ret_data_orig = sock.readpartial(read_len)
-#        this_ret_data_orig = sock.sysread(read_len)
         this_ret_data_orig = sock.recv(read_len)
       rescue
         raise(DangoFrameworkConnectionException, "failed to read sock(data).\n#{error_message($!, 'u')}")
       end
       
       ret_data_orig += this_ret_data_orig
-#      logger.debug "size:#{size.inspect}:this_ret_data_orig:#{this_ret_data_orig.inspect}"
       
       size -= this_ret_data_orig.size
-#      logger.debug "size:#{size.inspect}"
     end
     
-#    logger.debug "ret_data_orig:#{ret_data_orig.inspect}"
-    
     ret_data = dango_receive_decrypt(ret_data_orig[0..-2])
-#    logger.debug "ret_data:#{ret_data.inspect}"
     
     @recv_count += 1 if @recv_count # 受信回数カウント
     
@@ -243,8 +237,6 @@ module DangoFrameworkModule
   # データ送信処理
   def dango_send_data(sock, send_objs, options = {})
     encode_type = options[:encode_type] || DefaultEncodeType
-#    logger.debug "dango_send_data:sock=#{sock.inspect} encode_type=#{encode_type}"
-#    logger.debug "dango_send_data:send_objs=#{send_objs.inspect}"
     
     if send_objs == []
       send_data_orig = ""
@@ -258,46 +250,25 @@ module DangoFrameworkModule
       send_data_orig = JSON.generate(send_objs)
     end
     
-#    logger.debug "dango_send_data:#{send_data_orig.inspect}"
-#    logger.debug "dango_send_data:#{dango_send_encrypt(send_data_orig).inspect}"
-    
     send_data = dango_send_encrypt(send_data_orig) + "\n"
-#    send_data = dango_send_encrypt(send_data_orig) + "\r\n"
-#    send_data = dango_send_encrypt(send_data_orig) + "\015\012"
-    
-#    logger.debug "start dango_send_data:#{send_data.inspect}"
     
     size = send_data.size
     
-#    if size >= 4294967296 # 本当はuint最大値なんだけれど、policyファイルの都合で変えてある
-#    if size >= 1886350440 
     if size >= MaxLenSend
       raise(DangoFrameworkException, "max size over. size:#{size} >= #{MaxLenSend}") 
     end
     
-#    size_str = sprintf("%0#{CommMaxDigit}d", size)
-    
     size_str = [encode_type, size].pack("cN")
-#    logger.debug "size=#{size}:size_str=#{size_str.inspect}"
-    
     send_buf = size_str + "\n" + send_data
-#    logger.debug "send_buf:#{send_buf.inspect}"
-    
     begin
       sock.write send_buf
       sock.flush
-
-#      sock.send(send_buf, 0)
-#      sock.flush
-
     rescue
       raise(DangoFrameworkConnectionException, "sock write failed.\n#{error_message($!, 'u')}")
     end
     
     @send_count += 1 if @send_count # 受信回数カウント
-#    logger.debug "finish dango_send_data:#{send_data.inspect}"
-#    logger.debug "finish dango_send_data:toid=#{Thread.current.object_id} #{sock} #{sock.closed?}"
-
+    
     sock
   end
 end

data/lib/dango/monitor/server_monitor_action.rb

@@ -8,11 +8,11 @@ require 'ipaddr'
 
 # メインクラス
 class ServerMonitorAction
-  def initialize(parent, config, sock, ret_obj)
+  def initialize(parent, config, peerhost, peeraddr, ret_obj)
     @parent = parent
     @config = config
     
-    @logger     = @parent.logger
+    @logger        = @parent.logger
     @shared        = @parent.shared
     @session       = @parent.session
     @socket_list   = @parent.socket_list
@@ -21,7 +21,7 @@ class ServerMonitorAction
     # アクション名
     action_name = ret_obj["action"].to_s
     
-    dango_check_monitor_error(sock, action_name)
+    dango_check_monitor_error(peerhost, peeraddr, action_name)
     
     if action_name == '_monitor_all_info' # メンテナンスアクション名なら
       dango_server_monitor_all_info(ret_obj)
@@ -50,8 +50,7 @@ class ServerMonitorAction
   private
   
   # メンテナンスコマンド：エラーの場合
-  def dango_check_monitor_error(sock, action_name)
-    peerhost, peeraddr = sock.peeraddr[2, 2]
+  def dango_check_monitor_error(peerhost, peeraddr, action_name)
     backdoor_host = @backdoor_host
     logger.debug "dango_check_monitor_error:peerhost=#{peerhost.inspect} peeraddr=#{peeraddr.inspect} backdoor_host=#{backdoor_host.inspect}"
     

data/lib/dango/server_framework.rb

@@ -73,7 +73,7 @@ class DangoServerFramework
   def exit_process() # プロセス終了処理
     debug_print("shutdown")
     begin
-      File.delete(@pid_file)
+#      File.delete(@pid_file)
     rescue 
 #      puts "failed delete file. #{@pid_file}:#{$!.class}:#{$!.message}"
     end
@@ -145,17 +145,19 @@ class DangoServerFramework
       logger.warn("Dango Version=#{Dango::VERSION::STRING}")
 #    logger.debug("$LOADED_FEATURES=#{$LOADED_FEATURES.pretty_inspect}")
       
-      shared_init()                                  # 共有メモリを初期化
-      socket_list_init()                             # ソケット一覧を初期化
-      @session_manager = SessionManager.new(shared)  # セッション情報の初期化
-      @mutex_proc_thread = Mutex.new                 # スレッドが同時起動しないようにするためのMutex
-      heart_beat_thread_start()                      # ハートビートスレッドの開始
-      gc_thread_start()                              # GCスレッドの開始
+      shared_init()                                             # 共有メモリを初期化
+      socket_list_init()                                        # ソケット一覧を初期化
+      @mutex_sock = {}                                          # ソケットの排他処理ハッシュ
+      @session_manager = SessionManager.new(shared, RAILS_ENV)  # セッション情報の初期化
       
-      dango_server_init()                            # 初期設定読み込み
+      @mutex_proc_thread = Mutex.new                     # スレッドが同時起動しないようにするためのMutex
+      heart_beat_thread_start()                          # ハートビートスレッドの開始
+      gc_thread_start()                                  # GCスレッドの開始
       
-      @mutex_send_response = Mutex.new               # 送信レスポンス用のMutex
-      @arr_send_response = []                        # 送信レスポンス用のキャッシュ
+      dango_server_init()                                # 初期設定読み込み
+      
+      @mutex_send_response = Mutex.new                   # 送信レスポンス用のMutex
+      @arr_send_response = []                            # 送信レスポンス用のキャッシュ
       
       
       TCPSocket.do_not_reverse_lookup = true # 逆引きを行わない
@@ -274,15 +276,20 @@ class DangoServerFramework
     @thr_gr_gserver_serve.add(Thread.current) # スレッドグループに登録
     
     begin
-      sock.binmode
-      sock.sync = true
-      
       @session_manager.start_session() # sessionの開始処理 sidは自動生成
       sid = session[:sid]
       
-      session[:peer_addr] = sock.peeraddr
-      session[:peer_ip_address] = sock.peeraddr[3]
-      session[:peer_host] = sock.peeraddr[2]
+      # sockに対しての=nil write close などの書き換えに対する排他処理
+      @mutex_sock[sock.object_id] = Mutex.new 
+      
+      @mutex_sock[sock.object_id].synchronize do
+        sock.binmode
+        sock.sync = true
+        
+        session[:peer_addr] = sock.peeraddr
+        session[:peer_ip_address] = sock.peeraddr[3]
+        session[:peer_host] = sock.peeraddr[2]
+      end
       
       session[:encode_type] = DefaultEncodeType
       
@@ -315,29 +322,8 @@ class DangoServerFramework
         end
         
         if is_flash_policy_file # Flashのポリシーファイルが来たら
-          logger.debug "is_flash_policy_file"
-          
-          if @policy_file_request # ポリシーファイルを返す設定なら
-            logger.info "is_flash_policy_file #{sid} #{@policy_file_request}"
-
-            allow_str = ""
-            
-            @policy_file_allow_domain.each do |one_host|
-              allow_str += %Q|<allow-access-from domain="#{one_host}" to-ports="#{@policy_file_allow_port.join(',')}" />|
-              allow_str += "\n"
-            end
-
-            policy_data = <<EOF
-<?xml version="1.0"?>
-<cross-domain-policy>
-#{allow_str}
-</cross-domain-policy>
-EOF
-
-            logger.debug policy_data
-            sock.write policy_data
-            sock.flush
-            logger.info "policy file sent."
+          @mutex_sock[sock.object_id].synchronize do
+            do_flash_policy_file(sid, sock)
           end
           
           # この部分はポリシーファイルを返す設定に関係なく実行する部分
@@ -369,7 +355,9 @@ EOF
             @mutex_proc_thread.synchronize do
               
               if action_name[0, 9] == '_monitor_' # メンテナンスアクション名なら
-                ServerMonitorAction.new(self, @config, sock, ret_obj)
+                peerhost = session[:peer_host]
+                peeraddr = session[:peer_ip_address]
+                ServerMonitorAction.new(self, @config, peerhost, peeraddr, ret_obj)
                 
               elsif action_name == '_response' # 送信パケットの返事なら
                 action_name_is_response(ret_obj)
@@ -447,8 +435,9 @@ EOF
         ensure
           socket_list.delete(sid)     # ソケットリストから削除
           begin
-#            sock.close if !sock.closed?           # ソケットを閉じる
-            sock.close            # ソケットを閉じる
+            @mutex_sock[sock.object_id].synchronize do
+              sock.close            # ソケットを閉じる
+            end
           rescue IOError
             logger.info "IOError #{sock.inspect} #{sid}"
           rescue Exception
@@ -456,7 +445,10 @@ EOF
           end
           
           logger.info "#{sock.inspect} #{sid} is closed"
-          sock = nil
+          @mutex_sock[sock.object_id].synchronize do
+            sock = nil
+          end
+          @mutex_sock.delete(sock.object_id)
         end
       end # mutex_proc_thread
       
@@ -465,6 +457,34 @@ EOF
     
   end
   
+  # Flashのポリシーファイルの処理
+  def do_flash_policy_file(sid, sock) 
+    logger.debug "is_flash_policy_file"
+    
+    if @policy_file_request # ポリシーファイルを返す設定なら
+      logger.info "is_flash_policy_file #{sid} #{@policy_file_request}"
+
+      allow_str = ""
+      
+      @policy_file_allow_domain.each do |one_host|
+        allow_str += %Q|<allow-access-from domain="#{one_host}" to-ports="#{@policy_file_allow_port.join(',')}" />|
+        allow_str += "\n"
+      end
+
+      policy_data = <<EOF
+<?xml version="1.0"?>
+<cross-domain-policy>
+#{allow_str}
+</cross-domain-policy>
+EOF
+
+      logger.debug policy_data
+      sock.write policy_data
+      sock.flush
+      logger.info "policy file sent."
+    end
+  end
+  
   # action_nameが送信パケットの返事なら
   def action_name_is_response(ret_obj)
     logger.debug "action_name_is_response: #{ret_obj['_id'].inspect} #{session[:sid].inspect}"
@@ -511,12 +531,12 @@ EOF
     @policy_file_allow_port            = @config['server']['policy_file_allow_port']
     @policy_file_allow_port            = [@network_port] if !@policy_file_allow_port
     
-    @safe_resolver                     = @config['server']['safe_resolver'] || false # require 'resolv-replace'するかどうか
+    @safe_resolver             = @config['server']['safe_resolver'] || false # require 'resolv-replace'するかどうか
     
-    @statistics_process_memory         = @config['server']['statistics_process_memory'] || false # プロセスのメモリ使用量統計を取る
+    @statistics_process_memory = @config['server']['statistics_process_memory'] || false # プロセスのメモリ使用量統計取る
     
-    @backdoor_run_drb_server   = @config['server']['backdoor_run_drb_server'] || false # バックドア用のdrbサーバーを起動するかどうか
-    @backdoor_run_drb_port     = @config['server']['backdoor_run_drb_port'] || 12345   # バックドア用のdrbサーバーのポート番号
+    @backdoor_run_drb_server   = @config['server']['backdoor_run_drb_server'] || false # drbサーバーを起動するか
+    @backdoor_run_drb_port     = @config['server']['backdoor_run_drb_port'] || 12345   # drbサーバーのポート番号
     @backdoor_host             = @config['server']['backdoor_host'] || '127.0.0.1'     # バックドアのアクセス可能ホスト名
     
     @loop_setting              = @config['server']['loop_setting']                     # メインループ用の定義
@@ -625,25 +645,7 @@ EOF
           logger.debug "GC end #{Time.now - gc_start_time}sec "
 #          Thread.critical = false
           
-          # メモリ使用量統計
-          if @statistics_process_memory 
-            memory_usage = 0
-            if RUBY_PLATFORM == 'i386-mswin32'
-              require "win32ole"
-              locator = WIN32OLE.new("WbemScripting.SWbemLocator.1") #(A)
-              service = locator.ConnectServer                        #(B)
-              set = service.ExecQuery("select * from Win32_Process WHERE ProcessId = #{Process.pid}") #(C)
-              set.each do |process| 
-                memory_usage = process.PageFileUsage.to_i
-              end
-            else
-              stat = `cat /proc/#{Process.pid}/stat`.split(" ")
-              memory_usage = stat[22].to_i
-            end
-            
-            open("log/dango_stat_proc_mem_#{RAILS_ENV}.log", "ab"){|fh| fh.write "#{Time.now_to_s},#{memory_usage},#{@thr_gr_gserver_serve.list.length}\n" }
-            logger.debug "statistics_process_memory file add."
-          end
+          output_memory_statistics() if @statistics_process_memory # メモリ使用量統計
           
         rescue Exception
           logger.error "Exception gc_thread_start  #{error_message($!, 'u')}"
@@ -653,6 +655,29 @@ EOF
     th.priority = 3
   end
   
+  # メモリ使用量統計
+  def output_memory_statistics()
+    memory_usage = 0
+    if RUBY_PLATFORM == 'i386-mswin32'
+      require "win32ole"
+      locator = WIN32OLE.new("WbemScripting.SWbemLocator.1")
+      service = locator.ConnectServer
+      set = service.ExecQuery("select * from Win32_Process WHERE ProcessId = #{Process.pid}")
+      set.each do |process| 
+        memory_usage = process.PageFileUsage.to_i
+      end
+    else
+      stat = `cat /proc/#{Process.pid}/stat`.split(" ")
+      memory_usage = stat[22].to_i
+    end
+    
+    open("log/dango_stat_proc_mem_#{RAILS_ENV}.log", "ab") do |fh|
+      fh.write "#{Time.now_to_s},#{memory_usage},#{@thr_gr_gserver_serve.list.length}\n"
+    end
+    logger.debug "statistics_process_memory file add."
+  end
+  
+  
   # ハートビートスレッドの開始
   def heart_beat_thread_start
     shared[:_heart_beat_time_hash] = {}
@@ -663,38 +688,41 @@ EOF
         begin
           sleep @herat_beat_interval_sec
           
-          if ! @gserver.stopped? # gserverが起動していれば
-            logger.debug "heart_beat_thread_start "
+          next if @gserver.stopped? # gserverが起動していればスキップ
+          
+          logger.debug "heart_beat_thread_start "
+          
+          @mutex_proc_thread.synchronize do
+            # クライアントから来るハートビートのチェック
+            heart_beat_time_hash = shared[:_heart_beat_time_hash]
             
-            @mutex_proc_thread.synchronize do
-              # クライアントから来るハートビートのチェック
-              heart_beat_time_hash = shared[:_heart_beat_time_hash]
+            # 全員分のチェック
+            socket_list.all_sid.each do |sid|
+              sock = socket_list[sid]
               
-              # 全員分のチェック
-              socket_list.all_sid.each do |sid|
-                sock = socket_list[sid]
-                
-                if ! sock # すでにsocketが無い場合は、スキップ
-                  logger.warn "!!!! heart_beat_thread_start:sock is not found. #{sid}:#{sock}"
-                  next 
-                end
-                
-                # クライアントから来たハートビートの時間チェックし、古ければsocketを閉じる
-                if heart_beat_time_hash[sid] && heart_beat_time_hash[sid] < Time.now - @heart_beat_receive_wait_sec
-                  logger.warn "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{sock}:#{sock.closed?}"
-  #                sock.close if !sock.closed?
-                  begin
+              if ! sock # すでにsocketが無い場合は、スキップ
+                logger.warn "!!!! heart_beat_thread_start:sock is not found. #{sid}:#{sock}"
+                next 
+              end
+              
+              # クライアントから来たハートビートの時間チェックし、古ければsocketを閉じる
+              if heart_beat_time_hash[sid] && 
+                 heart_beat_time_hash[sid] < Time.now - @heart_beat_receive_wait_sec
+                logger.warn "!!!! heart_beat_thread_start:heart beat old:#{sid}:" + 
+                            "#{heart_beat_time_hash[sid]}:#{sock}:#{sock.closed?}"
+                begin
+                  @mutex_sock[sock.object_id].synchronize do
                     sock.close
-                  rescue IOError
-                    logger.debug "heart_beat_thread_start:maybe already closed. IOError:#{sid}:#{sock}"
-                  rescue
-                    logger.warn "heart_beat_thread_start:failed close socket:#{error_message($!, 'u')}"
-                  end
-                  next
+                  end # @mutex_sock[sock.object_id].synchronize
+                rescue IOError
+                  logger.debug "heart_beat_thread_start:maybe already closed. IOError:#{sid}:#{sock}"
+                rescue
+                  logger.warn "heart_beat_thread_start:failed close socket:#{error_message($!, 'u')}"
                 end
+                next
               end
-            end # @mutex_proc_thread
-          end # ! @gserver.stopped?
+            end # socket_list
+          end # @mutex_proc_thread
           
 #          # スレッド情報をログに出力
 #          if logger.debug?
@@ -802,6 +830,7 @@ EOF
         # sidごとにデータをまとめ送り
         send_data_sid_list.each do |sid, one_send_data_list|
           sock = socket_list[sid]
+          
           if !sock
             logger.info "thread_send_notice_queue:not found sid=#{sid} sock=#{sock.inspect}"
             next
@@ -813,11 +842,12 @@ EOF
           end
           
           begin
-            logger.debug "thread_send_notice_queue:dango_send_data:sid=#{sid} sock=#{sock.inspect} #{one_send_data_list.collect{|d| d['_notice_name'] + ','}}"
-#            logger.debug "thread_send_notice_queue:one_send_data_list=#{one_send_data_list.inspect}"
-#            logger.debug one_send_data_list.pretty_inspect
+            logger.debug "thread_send_notice_queue:dango_send_data:sid=#{sid} sock=#{sock.inspect} " + 
+                         "#{one_send_data_list.collect{|d| d['_notice_name'] + ','}}"
             
-            dango_send_data(sock, one_send_data_list, :type=>send_data_encode_type_list[sid]) # データ送信
+            @mutex_sock[sock.object_id].synchronize do
+              dango_send_data(sock, one_send_data_list, :type=>send_data_encode_type_list[sid]) # データ送信
+            end # mutex_sock[sock.object_id].synchronize
             
           rescue DangoFrameworkConnectionException
             logger.info "thread_send_notice_queue:failed send. sid=#{sid} sock=#{sock.inspect} #{$!.class}"

data/lib/dango/session_manager.rb

@@ -4,13 +4,14 @@
 class SessionManager
   MaxSidCounter = 999999
 
-  def initialize(shared)
+  def initialize(shared, rails_env)
     @shared = shared
+    @rails_env = rails_env
+    
     @session_list = {}
     @session_mutex = Mutex.new
     
     @shared[:_session_manager] = {}
-    
   end
   
   
@@ -26,7 +27,8 @@ class SessionManager
   def close_session(sid)
     @session_mutex.synchronize do
       drop_sid()
-      @session_list[Thread.current.object_id] = nil
+#      @session_list[Thread.current.object_id] = nil
+      @session_list.delete(Thread.current.object_id)
     end
   end
   
@@ -54,9 +56,8 @@ class SessionManager
         sid = ses_man[:sid_counter] if ! ses_man[:sid_list].has_key?(ses_man[:sid_counter])
       end
       
-      ses_man[:sid_list][ses_man[:sid_counter]] = "#{Process.pid}:#{Thread.current.object_id}"
+      ses_man[:sid_list][sid] = "#{@rails_env}:#{Process.pid}:#{Thread.current.object_id}"
       
-      ses_man
       @shared.commit(ses_man)
     end
     
@@ -68,9 +69,8 @@ class SessionManager
     @shared.transaction(:_session_manager) do |ses_man|
       
 #      ses_man[:sid_list].delete(sid)
-      ses_man[:sid_list].delete_if{|sid, oid| oid == "#{Process.pid}:#{Thread.current.object_id}" }
+      ses_man[:sid_list].delete_if{|sid, oid| oid == "#{@rails_env}:#{Process.pid}:#{Thread.current.object_id}" }
       
-      ses_man
       @shared.commit(ses_man)
     end
     

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-25 00:00:00 +09:00
+date: 2008-10-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe