dango 0.2.4 → 0.2.5

data/lib/dango/server_framework.rb

@@ -658,19 +658,19 @@ EOF
             # クライアントから来るハートビートのチェック
             heart_beat_time_hash = shared[:_heart_beat_time_hash]
             
-            # 全員へheart_beatパケットを送信
+            # 全員分のチェック
             socket_list.keys.each do |sid|
               sock = socket_list[sid]
-              next if ! sock
-#              logger.debug "heart_beat_thread_start:sid=#{sid} #{sock} #{sock.closed?}"
-#              send_notice("_heart_beat", sid, {}, {:timeout=>@heart_beat_response_wait_sec})
               
-              # クライアントから来たハートビートの時間チェックし、古ければsocketを閉じて、threadを殺す
+              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?
-#                logger.warn "!!!! heart_beat_thread_start:thread kill:#{session_th_list[sid]}"
-#                session_th_list[sid].kill
               end
             end
           end
@@ -729,15 +729,14 @@ EOF
 #    timeout = options[:timeout] || @send_receive_timeout_default_sec
     dtype = options[:type] || 0
     
-#    is_error = false
+    send_obj_dup = send_obj.deep_dup
+    send_obj_dup["notice"] = notice_name.to_s
+    send_obj_dup["server_time"] = Time.now_to_s
     
     sids.each do |sid|
-      send_obj_dup = send_obj.deep_dup
-      send_obj_dup["notice"] = notice_name.to_s
-      
+#      send_id = Digest::MD5.hexdigest(sid.to_s + notice_name.to_s + Time.now.to_f.to_s + rand().to_s)
 #      send_id = sid.to_s + notice_name.to_s + Time.now.to_f.to_s + rand().to_s
       send_id = notice_name.to_s + Time.now.to_f.to_s + rand().to_s
-#      send_id = Digest::MD5.hexdigest(sid.to_s + notice_name.to_s + Time.now.to_f.to_s + rand().to_s)
       send_obj_dup["_id"] = send_id
       
       @queue_send_notice.push([sid, send_obj_dup, dtype].deep_dup)
@@ -753,10 +752,16 @@ EOF
     loop do
       begin
         send_data_list = []
-        send_data_list.push(@queue_send_notice.pop) # Queueデータ待ち
+        
+        pop_data = @queue_send_notice.pop
+        send_data_list.push(pop_data) # Queueデータ待ち
 #        logger.debug "thread_send_notice_queue:sending data"
-        while(! @queue_send_notice.empty?) do       # 残りのデータもQueueに入れていく
-          send_data_list.push(@queue_send_notice.pop)
+#        while(! @queue_send_notice.empty?) do       # 残りのデータもQueueに入れていく
+
+        @queue_send_notice.size.times do 
+#        while(! @queue_send_notice.empty?) do       # 残りのデータもQueueに入れていく
+          pop_data = @queue_send_notice.pop
+          send_data_list.push(pop_data) # Queueデータ待ち
         end
         
         send_data_sid_list = {}
@@ -771,7 +776,7 @@ EOF
         end
         
         # sidごとにデータをまとめ送り
-        send_data_sid_list.each do |sid, one_send_data_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}"
@@ -784,11 +789,11 @@ EOF
           end
           
           begin
-            logger.debug "thread_send_notice_queue:dango_send_data:sid=#{sid} sock=#{sock.inspect} #{one_send_data_sid.collect{|d| d['notice'] + ','}}"
+            logger.debug "thread_send_notice_queue:dango_send_data:sid=#{sid} sock=#{sock.inspect} #{one_send_data_list.collect{|d| d['notice'] + ','}}"
             
-#            logger.debug one_send_data_sid.pretty_inspect
+#            logger.debug one_send_data_list.pretty_inspect
             
-            dango_send_data(sock, one_send_data_sid, :type=>send_data_dtype_list[sid]) # データ送信
+            dango_send_data(sock, one_send_data_list, :type=>send_data_dtype_list[sid]) # データ送信
             
           rescue DangoFrameworkConnectionError
             logger.info "thread_send_notice_queue:failed send. sid=#{sid} sock=#{sock.inspect} #{$!.class}"

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    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.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-19 00:00:00 +09:00
+date: 2008-05-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency