dango 0.0.15 → 0.0.18

data/lib/dango/client_framework.rb

@@ -71,6 +71,7 @@ class DangoClientFramework
     
     # ソケットの準備
     @sock = nil
+    @is_close = false
     
     # サーバーへ接続
     begin
@@ -116,19 +117,19 @@ class DangoClientFramework
             end
             
             # メソッド呼び出し
-            cs_logger.info "calling method=#{ret_obj["notice"].inspect} #{@sid}"
+            cs_logger.info "calling method=#{ret_obj["notice"].inspect} #{@sid} #{Time.now_to_s}"
             begin
               __send__("cs_receive_#{ret_obj["notice"]}", ret_obj)
             rescue
-              cs_logger.error "error in cs_receive_#{ret_obj["notice"]} #{@sid}\n#{error_message($!, 'u')}"
+              cs_logger.error "error in cs_receive_#{ret_obj["notice"]} #{@sid} #{Time.now_to_s}\n#{error_message($!, 'u')}"
             ensure
               # データの受信の送信返し
               response_notice_name = "_response"
               send_obj = {"_id" => ret_obj["_id"]}
               cs_client_send_data(response_notice_name, send_obj)
-              cs_logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid}"
+              cs_logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid} #{Time.now_to_s}"
             end
-            cs_logger.debug "called method=#{ret_obj["notice"].inspect} #{@sid}"
+            cs_logger.debug "called method=#{ret_obj["notice"].inspect} #{@sid} #{Time.now_to_s}"
             
           else
             sleep 0.01
@@ -160,16 +161,20 @@ class DangoClientFramework
   
   # クライアントの終了処理
   def client_quit()
-    begin
-      @sock.close if @sock
-    rescue
-      cs_logger.debug "sock close failed. #{$!}"
+    if ! @is_close
+      begin
+        @sock.close if @sock
+      rescue
+        cs_logger.debug "sock close failed. #{$!}"
+      end
+      @sock = nil
+      
+      @is_session_closed = true
+      cs_logger.info "calling cs_session_closed()"
+      cs_session_closed() # セッションが切れると呼ばれる処理
+      
+      @is_close = true
     end
-    @sock = nil
-    
-    @is_session_closed = true
-    cs_logger.info "calling cs_session_closed()"
-    cs_session_closed() # セッションが切れると呼ばれる処理
   end
   private :client_quit
   

data/lib/dango/server_framework.rb

@@ -17,7 +17,7 @@ class DangoServerFramework
   include DangoFrameworkModule
   
   SendReceiveSleepIntervalSec = 0.1  # データ送信後の順の際のタイムアウトチェック間隔秒
-  SendReceiveTimeoutDefaultSec = 0.5 # データ送受信時のデフォルトタイムアウト秒数
+  SendReceiveTimeoutDefaultSec = 2.0 # データ送受信時のデフォルトタイムアウト秒数
   SendTimeoutSec = 10.0    # データ送受信時の送信のタイムアウト秒数
   
   class DangoGServer < GServer
@@ -73,6 +73,7 @@ class DangoServerFramework
     set_server_variables()                # 各種サーバー仕様の変数設定
     
     cs_logger.debug("===== server initialize =====") # loggerの準備
+    cs_logger.debug("#{Time.now_to_s}")
     cs_logger.debug("Process.pid=#{Process.pid}")
     cs_logger.debug("port=#{@connection_server_port}")
     cs_logger.debug("host=#{@connection_server_host}")
@@ -171,7 +172,7 @@ class DangoServerFramework
   
   # gserver接続開始処理
   def disconnecting(port)
-    cs_logger.debug "disconnecting:port=#{port}"
+    cs_logger.debug "disconnecting:port=#{port} #{Time.now_to_s}"
   end
   
   # gserverのserveメソッド：スレッド開始処理
@@ -197,6 +198,11 @@ class DangoServerFramework
         cs_logger.debug "_notice_sid #{sid} #{Time.now_to_s}"
 #      end
       
+      # 誰かが接続したときに60秒以上経った@arr_send_responseを削除
+      @mutex_send_response.synchronize do
+        @arr_send_response.delete_if{|r| r[:time] < Time.now - 60}
+      end
+      
       # メインループ入り
       loop do
         if sock.closed?
@@ -258,7 +264,8 @@ class DangoServerFramework
             
           end # @mutex_proc_thread.synchronize
         end
-      end
+        
+      end # loop
       
     rescue DangoFrameworkReadNoDataError
       cs_logger.debug "read no data. maybe client closed. #{Thread.current.object_id} #{Time.now_to_s}"
@@ -294,8 +301,9 @@ class DangoServerFramework
   
   # action_nameが送信パケットの返事なら
   def action_name_is_response(ret_obj)
+#    cs_logger.warn "action_name_is_response:#{ret_obj['_id']} #{session[:sid]} #{Time.now_to_s}" 
     @mutex_send_response.synchronize do
-      @arr_send_response.push(ret_obj["_id"])
+      @arr_send_response.push({:_id => ret_obj["_id"], :time => Time.now})
     end
   end
   
@@ -489,12 +497,11 @@ class DangoServerFramework
     
     sock = socket_list[sid]
     raise(DangoFrameworkError, "not found sid=#{sid}") if !sock
-    raise(DangoFrameworkConnectionError, "socket closed. s_id=#{sid}") if sock.closed?
+    raise(DangoFrameworkConnectionError, "socket closed. sid=#{sid}") if sock.closed?
     
 #    cs_logger.debug "cs_server_send_data:sending data notice_name=#{notice_name.inspect}"
     send_obj_dup = send_obj.deep_dup
     send_obj_dup["notice"] = notice_name.to_s
-    send_obj_dup["_id"] = Digest::MD5.hexdigest(sid.to_s + Time.now.to_i.to_s)
     
     # データ送信時にクライアントからのレスポンスを確認する（Flashのバグらしきもの対策）
 #    if notice_name.to_s =~ /^return_/
@@ -508,13 +515,16 @@ class DangoServerFramework
       Thread.start do
         begin
           mutex_socket_list.synchronize(sid) do
-            cs_logger.warn "mutex_socket_list:synchronize:#{notice_name} #{sid} #{Time.now_to_s}" 
+#            cs_logger.debug "mutex_socket_list:synchronize:#{notice_name} #{sid} #{Time.now_to_s}"
+            
+            digest_key = sid.to_s + notice_name.to_s + Time.now.to_f.to_s + rand().to_s
+            send_obj_dup["_id"] = Digest::MD5.hexdigest(digest_key)
             have_came_response = nil
             
             receive_thread = Thread.start do
               begin
                 cs_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
-                cs_logger.debug "cs_server_send_data:sent:notice_name=#{notice_name.inspect} #{sid} #{Time.now_to_s}"
+#                cs_logger.debug "cs_server_send_data:sent:notice_name=#{send_obj_dup['_id']} #{notice_name.inspect} #{sid} #{Time.now_to_s}"
               rescue DangoFrameworkError
                 cs_logger.debug "ERROR:cs_server_send_data:DangoFrameworkError:notice_name=#{notice_name.inspect} #{sid} #{Time.now_to_s}"
               end
@@ -525,6 +535,7 @@ class DangoServerFramework
               # タイムアウトの場合は
               cs_logger.warn "cs_server_send_data:send timeout:#{notice_name} #{sid} #{Time.now_to_s}" 
             else
+#              cs_logger.warn "cs_server_send_data:sent after join:#{notice_name} #{sid} #{Time.now_to_s}" 
               end_reserved_time = Time.now + timeout
               
               # タイムアウトチェック
@@ -536,9 +547,11 @@ class DangoServerFramework
                   end
                   
                   @mutex_send_response.synchronize do
-                    if @arr_send_response.delete(send_obj_dup["_id"])
+                    find_res = @arr_send_response.find{|r| r[:_id] == send_obj_dup["_id"]}
+                    
+                    if find_res
+                      @arr_send_response.delete(find_res)
                       have_came_response = true
-#                      cs_logger.debug "response check ok:#{notice_name} #{sid} #{Time.now_to_s}"
                       throw(:send_timeout)
                     end
                   end
@@ -551,7 +564,7 @@ class DangoServerFramework
                 cs_logger.warn "!!! received data is none:#{notice_name} #{sid} #{Time.now_to_s}"
               end
             end
-          end
+          end # mutex
         rescue
           cs_logger.debug "send_response_thread error:#{error_message($!, 'u')}"
         end
@@ -633,7 +646,8 @@ class DangoServerFramework
       key = $1
       method_action_notice_shared(key, name, *args)
     else
-#      raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
+      cs_logger.info "method not found. #{name.inspect} #{args.inspect}"
+      raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
     end
   end
   

data/lib/dango/tasks/dango_rake.rb

@@ -4,10 +4,59 @@ ENV['RAILS_ENV'] = ENV['RAILS_ENV'] || 'development'
 namespace :dango do
   desc "initialize dango"
   task :initialize do
+    puts "complete initialize."
   end
 
   desc "make swf"
   task :make_swf do
+    puts "complete make_swf."
+  end
+
+  desc "check dango process"
+  task :check_dango_process do
+    # pidのチェック
+    pid = open("tmp/pids/dango.pid", "rb"){|fh| fh.read }.to_i
+    puts "pid=#{pid}"
+    
+    # そのpidのプロセスがあるかのチェック
+    is_pid_exist = nil
+    if RUBY_PLATFORM == 'i386-mswin32'
+      # WbemからProcessIDを取得
+      require "win32ole"
+      begin
+        n_locator = WIN32OLE.new("WbemScripting.SWbemLocator.1")
+        n_service = n_locator.ConnectServer
+      rescue
+        puts "failed connect to Wbem:#{$!.inspect}"
+        return
+      end
+      
+      set = n_service.ExecQuery("select Caption, ProcessID from Win32_Process")
+      set.each do |one|
+#        puts(sprintf("Win32_Process %8d %s", one.ProcessID, one.Caption))
+        if one.ProcessID == pid
+          is_pid_exist = true
+        end
+      end
+    else
+      is_pid_exist = FileTest.exist?("/proc/#{pid}")
+    end
+    
+    puts "is_pid_exist=#{is_pid_exist}"
+    
+    # コンフィグから check_dango_process_cmd を取得
+    config = YAML.load(open("dango/config/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
+    check_dango_process_cmd = config['server']['check_dango_process_cmd'] || nil
+    
+    # is_pid_existがないならcheck_dango_process_cmd実行
+    if ! is_pid_exist && check_dango_process_cmd
+      puts "check_dango_process_cmd=#{check_dango_process_cmd}"
+      system(check_dango_process_cmd)
+    end
+    
+    check_dango_process_cmd
+    
+    puts "complete check_dango_process."
   end
 
   namespace :monitor do
@@ -56,7 +105,7 @@ namespace :dango do
         p $!.message
         p $!.backtrace
       end
-      puts "complete server_reload."
+      puts "complete send_system_message."
     end
     
   end

data/lib/dango/tester/dango_tester_client.rb

@@ -39,11 +39,22 @@ class DangoTesterClient
   end
   
   attr_reader(:client_conns)
+  
+  def die(str)
+    puts "============ die ============ #{Time.now_to_s}"
+    pp caller()
+    puts str
+    exit 1
+  end
+  
+  def self.die(str)
+    die(str)
+  end
 end
 
 # テスト接続用のクラス
 class TestClient < DangoClientFramework
-  SendReceiveSleepIntervalSec = 0.001    # データ送信後の順の際のタイムアウトチェック間隔秒
+  SendReceiveSleepIntervalSec = 0.03    # データ送信後の順の際のタイムアウトチェック間隔秒
   ReceiveWaitTimeoutSec = 10             # データ受信確認の待ち秒数
   ReceiveTrapTimeoutSec = 0              # データ受信確認のトラップの秒数
   
@@ -55,6 +66,7 @@ class TestClient < DangoClientFramework
     
     @receive_mutex = Mutex.new # 送受信用の排他処理
     @receive_arr = []
+    @trap_thread_hash = {}
     
     @receive_methods = []
     
@@ -86,99 +98,115 @@ class TestClient < DangoClientFramework
     cs_client_send_data(name, send_obj)
   end
   
-  # trap_receive_data
-  def trap_receive_data(receive_name, options = {})
+  # trap_receive
+  def trap_receive(receive_name, options = {})
     cs_logger.debug "trap_receive_data:#{receive_name}:#{Time.now_to_s}"
     timeout = options[:timeout] || ReceiveTrapTimeoutSec
     trap_proc = options[:proc] || nil
     raise(ArgumentError, ":proc is not Proc class.") if trap_proc && ! trap_proc.is_a?(Proc)
     
-    cs_logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect}"
+    # 戻ってきたデータのチェックメソッド
+    receive_name_sym = (receive_name.class == Symbol) ? (":"+receive_name.to_s) : ('"'+receive_name+'"')
     
-    Thread.start do
-      send_receive_shared[receive_name] = nil
-      if timeout == 0
-        end_reserved_time = Time.at(0)         # 0ならepochを入れる
-      else
-        end_reserved_time = Time.now + timeout # 0以上ならタイムアウト時間決定
-      end
-      
-      # 戻ってきたデータのチェックメソッド
-      receive_name_sym = (receive_name.class == Symbol) ? (":"+receive_name.to_s) : ('"'+receive_name+'"')
-      
-      if ! @receive_methods.include?(receive_name_sym)
-        instance_method_name = "cs_receive_#{receive_name}"
-        expr = <<-EOF
-          def self.#{instance_method_name}(ret_obj)
-            cs_logger.debug "ret_obj:" + ret_obj.inspect
-            send_receive_shared[#{receive_name_sym}] = ret_obj
-          end
-        EOF
-        instance_eval expr
-        @receive_methods.push(receive_name_sym)
-      end
+    if ! @receive_methods.include?(receive_name_sym)
+      instance_method_name = "cs_receive_#{receive_name}"
+      expr = <<-EOF
+        def self.#{instance_method_name}(ret_obj)
+          cs_logger.debug "ret_obj:" + ret_obj.inspect + " " + Time.now_to_s
+          send_receive_shared[#{receive_name_sym}] = ret_obj
+        end
+      EOF
+      instance_eval expr
+      @receive_methods.push(receive_name_sym)
+    end
+    
+    # @trap_thread_hashにスレッド登録
+    if ! @trap_thread_hash.has_key?(receive_name)
       
-      # タイムアウトチェック
-      cs_logger.debug "trap_receive_data:666:#{end_reserved_time}"
-      loop do
-#      (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
-#        if end_reserved_time < Time.now
+      # スレッド開始
+      th = Thread.start do
+        send_receive_shared[receive_name] = nil
+        if timeout == 0
+          end_reserved_time = Time.at(0)         # 0ならepochを入れる
+        else
+          end_reserved_time = Time.now + timeout # 0以上ならタイムアウト時間決定
+        end
         
-        if end_reserved_time != Time.at(0) && end_reserved_time < Time.now
-          raise(DangoFrameworkTimeoutError, "timeout:client_name=#{@client_name}:receive_name=#{receive_name} #{Time.now_to_s}") 
+        # タイムアウトチェック
+        loop do
+          if end_reserved_time != Time.at(0) && end_reserved_time < Time.now
+            raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}:\nclient_name=#{@client_name}(#{self.sid}):\nreceive_name=#{receive_name} \n#{Time.now_to_s}") 
+          end
+          
+          # 戻ってきたデータがあれば
+          if send_receive_shared[receive_name]
+            cs_logger.debug "receive_name:#{send_receive_shared[receive_name].inspect} #{Time.now_to_s}"
+            break 
+          end
+          
+          sleep SendReceiveSleepIntervalSec # スリープ
         end
         
-        # 戻ってきたデータがあれば
-        if send_receive_shared[receive_name]
-          cs_logger.debug "receive_name:#{send_receive_shared[receive_name].inspect}"
-          break 
+        # 戻ってきたデータがあるかどうかチェック
+        if !send_receive_shared[receive_name] 
+          raise(DangoFrameworkError, "received data is none. sid=#{sid} receive_name=#{receive_name}")
         end
         
-        sleep SendReceiveSleepIntervalSec # スリープ
-      end
+        # :procが設定されている場合は、それを呼び出す
+        if trap_proc
+          cs_logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect} #{Time.now_to_s}"
+          trap_proc.call(send_receive_shared[receive_name])
+          
+        # :procが設定されていなければ、wait用に@receive_arrに入れておく
+        else
+          @receive_mutex.synchronize do
+            cs_logger.debug "receive_name:#{receive_name}:#{send_receive_shared[receive_name].inspect} #{Time.now_to_s}"
+            @receive_arr.push([receive_name, send_receive_shared[receive_name]])
+          end
+        end
+      end # Thread
       
-      cs_logger.debug "trap_receive_data:555"
-      # 戻ってきたデータがあるかどうかチェック
-      if !send_receive_shared[receive_name] 
-        raise(DangoFrameworkError, "received data is none. sid=#{sid} receive_name=#{receive_name}")
-      end
+      @trap_thread_hash[receive_name] = th
+    else
       
-      # :procが設定されている場合は、それを呼び出す
-      cs_logger.debug "trap_receive_data:222:#{receive_name}:#{trap_proc.inspect}"
-      if trap_proc
-      cs_logger.debug "trap_receive_data:333:#{receive_name}"
-        cs_logger.debug "trap_receive_data:trap_proc is true:#{trap_proc.inspect}"
-        trap_proc.call(send_receive_shared[receive_name])
-        
-      # :procが設定されていなければ、wait用に@receive_arrに入れておく
-      else
-      cs_logger.debug "trap_receive_data:444"
-        @receive_mutex.synchronize do
-          cs_logger.debug "receive_name:#{receive_name}:#{send_receive_shared[receive_name].inspect}"
-          @receive_arr.push([receive_name, send_receive_shared[receive_name]])
-        end
-      end
+      cs_logger.debug "trap_receive_data:already register trap:receive_name:#{receive_name} #{Time.now_to_s}"
     end
+    
+  end
+  
+  # cancel trap_receive
+  def cancel_trap_receive(receive_name, options = {})
+    cs_logger.debug "cancel_trap_receive:#{receive_name}:#{Time.now_to_s}"
+    
+    @trap_thread_hash[receive_name].kill
+    
+    @trap_thread_hash.delete(receive_name)
   end
   
-  # wait_receive_data
-  def wait_receive_data(receive_name, options = {})
+  # wait_receive
+  def wait_receive(receive_name, options = {})
+    cs_logger.debug "wait_receive_data:#{receive_name}:#{Time.now_to_s}"
     timeout = options[:timeout] || ReceiveWaitTimeoutSec
     
     # データ受信待ち
     receive_data = nil
-    (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
+    
+    end_reserved_time = Time.now + timeout # 0以上ならタイムアウト時間決定
+    
+    loop do
       @receive_mutex.synchronize do
         receive_data = @receive_arr.find{|r| r[0] == receive_name}.deep_dup
-#        p @receive_arr
       end
+      
       break if receive_data != nil
+      break if end_reserved_time < Time.now
+      
       sleep SendReceiveSleepIntervalSec # スリープ
     end
     
     # タイムアウトなら
     if receive_data == nil
-      raise(DangoFrameworkTimeoutError, "timeout:client_name=#{@client_name}:receive_name=#{receive_name} #{Time.now_to_s}") 
+      raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}:\nclient_name=#{@client_name}(#{self.sid})\:receive_name=#{receive_name} \n#{Time.now_to_s}") 
     end
     
     # 結果を削除しておく
@@ -186,6 +214,8 @@ class TestClient < DangoClientFramework
       @receive_arr.delete_if{|r| r[0] == receive_name}
     end
     
+    @trap_thread_hash.delete(receive_name)
+    
     receive_data[1]
   end
   

data/lib/dango/version.rb

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