dango 0.0.22 → 0.0.23

data/lib/dango/framework_base.rb

@@ -138,8 +138,8 @@ module DangoFrameworkModule
 #      size_str = sock.readpartial(CommMaxDigit + 1)
 #      size_str = sock.sysread(CommMaxDigit + 1)
       size_str = sock.recv(CommMaxDigit + 1)
-    rescue EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT
-      # EOFErrorはその接続終了時の切断と思われるのでDangoFrameworkConnectionErrorにしない
+    rescue EOFError, IOError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNABORTED
+      # 接続終了時の切断と思われるものはDangoFrameworkConnectionErrorにしない
       #raise(DangoFrameworkError, "failed to read sock for EOF reached.\n#{error_message($!, 'u')}")
       raise(DangoFrameworkError, "failed to read sock for EOF reached (and so on). #{$!.class} toid=#{Thread.current.object_id}")
     rescue
@@ -240,7 +240,7 @@ module DangoFrameworkModule
     
 #    if size >= 4294967296 # 本当はuint最大値なんだけれど、policyファイルの都合で変えてある
     if size >= 1886350440
-      raise(DangoFrameworkError, "max size over. size:#{size} >= 4294967296") 
+      raise(DangoFrameworkError, "max size over. size:#{size} >= 1886350440") 
     end
     
 #    size_str = sprintf("%0#{CommMaxDigit}d", size)
@@ -255,17 +255,17 @@ module DangoFrameworkModule
       sock.write send_buf
       sock.flush
 
-#      sock.send(size_str + "\n", 0)
+#      sock.send(send_buf, 0)
 #      sock.flush
 
-#      sock.send(send_data, 0)
-#      sock.flush
     rescue
       raise(DangoFrameworkConnectionError, "sock write failed.\n#{error_message($!, 'u')}")
     end
     
     @send_count += 1 if @send_count # 受信回数カウント
 #    cs_logger.debug "finish send_data:#{send_data.inspect}"
+#    cs_logger.debug "finish send_data:#{Time.now_to_s}:toid=#{Thread.current.object_id} #{sock} #{sock.closed?}"
+
     sock
   end
 end

data/lib/dango/server_framework.rb

@@ -19,7 +19,8 @@ class DangoServerFramework
   SendReceiveSleepIntervalSec = 0.2   # データ送信後の順の際のタイムアウトチェック間隔秒
   SendReceiveTimeoutDefaultSec = 2.0  # データ送受信時のデフォルトタイムアウト秒数
   SendTimeoutSec = 10.0               # データ送受信時の送信のタイムアウト秒数
-  HeratBeatIntervalSec = 60.0         # S=>Cのハートビートの送信タイミング
+  HeratBeatIntervalSec = 60.0         # S=>Cのheart beatの送信タイミング
+  HeratBeatResponseWaitlSec = 20.0    # S=>Cのheart beatの返信待ちタイミング
   
   class DangoGServer < GServer
     def initialize(parent, *args)
@@ -170,7 +171,8 @@ class DangoServerFramework
   
   # gserver接続開始処理
   def connecting(sock)
-    cs_logger.debug "connecting:sock=#{sock}"
+    cs_logger.debug "connecting:sock=#{sock} peeraddr=#{sock.peeraddr.inspect} addr=#{sock.addr.inspect}"
+#    cs_logger.debug "getpeername=#{Socket.unpack_sockaddr_in(sock.getpeername).inspect} getsockname=#{Socket.unpack_sockaddr_in(sock.getsockname).inspect}"
   end
   
   # gserver接続開始処理
@@ -521,9 +523,10 @@ class DangoServerFramework
             
             # 全員へ空パケットを送信
             socket_list.keys.each do |sid|
-              cs_logger.debug "heart_beat_thread_start:sid=#{sid}"
               sock = socket_list[sid]
-              cs_send_data(sock, {})
+              cs_logger.debug "heart_beat_thread_start:sid=#{sid} #{sock} #{sock.closed?}"
+#              cs_send_data(sock, {})
+              cs_server_send_data(sid, "_heart_beat", {}, {:timeout=>HeratBeatResponseWaitlSec})
             end
           end
           
@@ -544,9 +547,14 @@ class DangoServerFramework
     timeout = options[:timeout] || SendReceiveTimeoutDefaultSec
     dtype = options[:type] || 0
     
+    sock = socket_list[sid]
+    if !sock # sockがないという事はすでに切断済み
+      cs_logger.info "cs_server_send_data:already closed socket. sid=#{sid.inspect} sock=#{sock.inspect} #{Time.now_to_s}"
+      return
+    end
+    
     # sidの通知の場合はレスポンスを気にしない
     if notice_name.to_s == "_notice_sid"
-      sock = socket_list[sid]
       raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
       raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
       
@@ -556,9 +564,8 @@ class DangoServerFramework
       cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
 #      cs_logger.debug "cs_server_send_data:finish send data notice_name=#{notice_name.inspect}\n"
     else
-      Thread.start(sid, notice_name, send_obj, dtype, timeout) do
+      Thread.start(sid, notice_name, send_obj, dtype, timeout, sock) do
         begin
-          sock = socket_list[sid]
           raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
           raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
           
@@ -596,6 +603,11 @@ class DangoServerFramework
                 (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
                   if Time.now > end_reserved_time
                     cs_logger.debug "cs_server_send_data:receive timeout:#{notice_name}" 
+                    
+                    if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
+                      cs_logger.info "!!!! cs_server_send_data:heart_beat timeout" 
+                      sock.close if !sock.closed?
+                    end
                     break
                   end
                   
@@ -603,6 +615,8 @@ class DangoServerFramework
                     find_res = @arr_send_response.find{|r| r[:_id] == send_obj_dup["_id"]}
                     
                     if find_res
+                      cs_logger.debug "cs_server_send_data:find_res _heart_beat #{sid}" if notice_name.to_s == "_heart_beat"
+                      
                       @arr_send_response.delete(find_res)
                       have_came_response = true
                       throw(:send_timeout)

data/lib/dango/socket_list.rb

@@ -29,7 +29,8 @@ class SocketList
   
   def [](key)
     @sl_mutex.synchronize do
-      raise("not exist key(#{key.inspect})") if ! @sl_hash.has_key?(key) 
+#      raise("not exist key(#{key.inspect})") if ! @sl_hash.has_key?(key) 
+      return(nil) if ! @sl_hash.has_key?(key) 
       @sl_hash[key]
     end
   end

data/lib/dango/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.22
-date: 2007-10-29 00:00:00 +09:00
+  version: 0.0.23
+date: 2007-10-30 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib