dango 0.0.4 → 0.0.5

data/lib/dango/script/dango_server.rb

@@ -7,7 +7,7 @@
 	require 'dango/server_framework'
 
 #  require RAILS_ROOT + '/config/boot'
-  require RAILS_ROOT + '/config/environment'
+	require RAILS_ROOT + '/config/environment'
 
 	# 環境によるコンフィグ読み込み
 	env = ENV['RAILS_ENV'] || 'development'

data/lib/dango/server_framework.rb

@@ -548,77 +548,80 @@ class DangoServerFramework
     send_obj_dup["notice"] = notice_name.to_s
     
     # データ送信時にクライアントからのレスポンスを確認する（Flashのバグらしきもの対策）
-    if notice_name.to_s =~ /^return_/
-      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
+#    if notice_name.to_s =~ /^return_/
+#      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 do
-        mutex_socket_list.synchronize(session_id) do
-          send_receive_shared[notice_name] = nil
-          
-          receive_thread = nil
-          end_reserved_time = Time.now + timeout
-          
-          # 戻ってきたデータのチェック
-          notice_name_sym = (notice_name.class == Symbol) ? (":"+notice_name.to_s) : ('"'+notice_name+'"')
-          instance_method_name = "cs_receive_response_#{notice_name}"
-#          cs_logger.debug "instance_eval notice_name_sym=" + notice_name_sym.inspect
-          expr = <<-EOF
-            def self.#{instance_method_name}(ret_obj)
-              begin
-                send_receive_shared[#{notice_name_sym}] = ret_obj
-              rescue Exception
-                cs_logger.debug "instance_eval Error=" + $!.class.to_s
-                cs_logger.debug "instance_eval Error=" + $!.message.to_s
-                cs_logger.debug "instance_eval Error=" + $!.backtrace.pretty_inspect
-              end
-            end
-            cs_logger.debug "defined:#{instance_method_name}"
-          EOF
-#          cs_logger.debug "expr:#{expr.inspect}"
-#          cs_logger.debug "send_receive_shared:#{self.send_receive_shared().inspect}"
-          instance_eval expr
-          
-          # タイムアウトチェック
-          (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
-            if Time.now > end_reserved_time
-              cs_logger.debug "timeout:#{notice_name}" 
-              break
-#              raise(DangoFrameworkTimeoutError, "timeout:#{notice_name}")
-            end
+        begin
+          mutex_socket_list.synchronize(session_id) do
+            send_receive_shared[notice_name] = nil
             
-            # 送信スレッドが開始していなければ開始
-            if !receive_thread
-              receive_thread = Thread.start do
+            receive_thread = nil
+            end_reserved_time = Time.now + timeout
+            
+            # 戻ってきたデータのチェック
+            notice_name_sym = (notice_name.class == Symbol) ? (":"+notice_name.to_s) : ('"'+notice_name+'"')
+            instance_method_name = "cs_receive_response_#{notice_name}"
+  #          cs_logger.debug "instance_eval notice_name_sym=" + notice_name_sym.inspect
+            expr = <<-EOF
+              def self.#{instance_method_name}(ret_obj)
                 begin
-                  cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
-#                  cs_logger.debug "cs_server_send_data:send data notice_name=#{notice_name.inspect}\n"
-                rescue DangoFrameworkError
-                  cs_logger.debug "cs_server_send_data:notice_name=#{notice_name.inspect}\n"
+                  send_receive_shared[#{notice_name_sym}] = ret_obj
+                rescue Exception
+                  cs_logger.debug "instance_eval Error=" + $!.class.to_s
+                  cs_logger.debug "instance_eval Error=" + $!.message.to_s
+                  cs_logger.debug "instance_eval Error=" + $!.backtrace.pretty_inspect
                 end
               end
-            end
+              cs_logger.debug "defined:#{instance_method_name}"
+            EOF
+  #          cs_logger.debug "expr:#{expr.inspect}"
+  #          cs_logger.debug "send_receive_shared:#{self.send_receive_shared().inspect}"
+            instance_eval expr
             
-            # 戻ってきたデータがあれば
-            if send_receive_shared[notice_name]
-              cs_logger.debug "notice_name:#{send_receive_shared[notice_name].inspect}"
-              break 
+            # タイムアウトチェック
+            (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
+              if Time.now > end_reserved_time
+                cs_logger.debug "timeout:#{notice_name}" 
+                break
+  #              raise(DangoFrameworkTimeoutError, "timeout:#{notice_name}")
+              end
+              
+              # 送信スレッドが開始していなければ開始
+              if !receive_thread
+                receive_thread = Thread.start do
+                  begin
+                    cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
+  #                  cs_logger.debug "cs_server_send_data:send data notice_name=#{notice_name.inspect}\n"
+                  rescue DangoFrameworkError
+                    cs_logger.debug "cs_server_send_data:notice_name=#{notice_name.inspect}\n"
+                  end
+                end
+              end
+              
+              # 戻ってきたデータがあれば
+              if send_receive_shared[notice_name]
+                cs_logger.debug "notice_name:#{send_receive_shared[notice_name].inspect}"
+                break 
+              end
+              
+              sleep SendReceiveSleepIntervalSec # スリープ
+            end # タイムアウト処理終わり
+            
+            if !send_receive_shared[notice_name] # 戻ってきたデータがあるかどうかチェック
+  #            raise(DangoFrameworkError, "received data is none") 
+              cs_logger.warn "!!! received data is none. #{notice_name} #{send_receive_shared[notice_name].inspect}"
             end
             
-            sleep SendReceiveSleepIntervalSec # スリープ
-          end # タイムアウト処理終わり
-          
-          if !send_receive_shared[notice_name] # 戻ってきたデータがあるかどうかチェック
-#            raise(DangoFrameworkError, "received data is none") 
-            cs_logger.debug "received data is none. #{send_receive_shared[notice_name].inspect}"
+            remove_method(instance_method_name) # 定義したインスタンスメソッドを削除しておく
           end
-          
-          remove_method(instance_method_name) # 定義したインスタンスメソッドを削除しておく
+        rescue
+          cs_logger.debug "send_response_thread error:#{error_message($!, 'u')}"
         end
       end # Thread:end
       
-      sleep SendReceiveSleepIntervalSec # スリープ
-    end
+#    end
     
     self
   end

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     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.4
-date: 2007-10-04 00:00:00 +09:00
+  version: 0.0.5
+date: 2007-10-09 00:00:00 +09:00
 summary: Ruby - Flash conneciton network flamework
 require_paths: 
 - lib