dango 0.0.24 → 0.0.25

data/lib/dango/server_framework.rb

@@ -16,11 +16,18 @@ require "dango/monitor/server_monitor_action"
 class DangoServerFramework
   include DangoFrameworkModule
   
-  SendReceiveSleepIntervalSec = 0.2   # データ送信後の順の際のタイムアウトチェック間隔秒
+  ### 以下すべてデフォルト値
+  DefaultNetworkPort = 15000          # デフォルトのポート番号
+  DefaultServerHost = 'localhost'     # デフォルトのホスト名 # 接続制限ホスト "0.0.0.0"にすれば全接続オッケイ
+  DefaultMaxConnections = 10          # デフォルトの最大接続人数
+  
+  # ここから先は普通は変更しなくていいだろうというもの
+  SendReceiveSleepIntervalSec = 0.2   # データ送信時のタイムアウトチェック間隔秒
   SendReceiveTimeoutDefaultSec = 2.0  # データ送受信時のデフォルトタイムアウト秒数
   SendTimeoutSec = 10.0               # データ送受信時の送信のタイムアウト秒数
-  HeratBeatIntervalSec = 20.0         # S=>Cのheart beatの送信タイミング
-  HeratBeatResponseWaitlSec = 20.0    # S=>Cのheart beatの返信待ちタイミング
+  HeartBeatIntervalSec = 60.0         # S=>Cのheart beatの送信間隔秒数
+  HeartBeatResponseWaitSec = 20.0     # S=>Cのheart beatの返信待ち秒数
+  
   
   class DangoGServer < GServer
     def initialize(parent, *args)
@@ -99,7 +106,14 @@ class DangoServerFramework
                                 @connection_server_host, 
                                 @connection_server_max_connections)
     @gserver.audit = true                 # Turn logging on.
-    @gserver.start
+    
+    begin
+      @gserver.start
+    rescue Exception
+      error_msg = "#{$!.class} #{$!.message} #{$!.backtrace.pretty_inspect}"
+      cs_logger.error error_msg
+      puts error_msg
+    end
   end
   
   # サーバーのループ時のクラス読み直し処理
@@ -152,9 +166,7 @@ class DangoServerFramework
           begin
             load f[:file]
           rescue Exception
-            p $!.class
-            p $!.message
-            p $!.backtrace
+            puts "#{$!.class} #{$!.message} #{$!.backtrace.pretty_inspect}"
           end
         end
 
@@ -183,7 +195,8 @@ class DangoServerFramework
   # gserverのserveメソッド：スレッド開始処理
   def thread_main(sock)
     cs_logger.debug "thread_main:start"
-    cs_logger.debug "#{sock} is accepted. thread.current=#{Thread.current.object_id} sock_id=#{sock.object_id}"
+#    cs_logger.debug "#{sock} is accepted. thread.current=#{Thread.current.object_id} sock_id=#{sock.object_id}"
+    cs_logger.debug "#{sock} is accepted. thread.current=#{Thread.current.object_id}"
     
     begin
       sock.binmode
@@ -287,12 +300,12 @@ class DangoServerFramework
       cs_logger.error "Exception #{sid} #{Time.now_to_s} #{error_message($!, 'u')}"
       
     ensure
-      cs_logger.debug "#{sock.inspect} sock_id=#{sock.object_id} #{sid} is gone"
+      cs_logger.debug "#{sock.inspect} #{sid} is gone"
       
       @mutex_proc_thread.synchronize do
         begin
           cs_close() # 接続解除時に呼び出されるメソッド
-        rescue
+        rescue Exception
           cs_logger.error "#{error_message($!, 'u')}"
         ensure
           socket_list.delete(sid)     # ソケットリストから削除
@@ -302,7 +315,7 @@ class DangoServerFramework
             cs_logger.debug "IOError #{sock} #{sid}"
           end
           
-          cs_logger.debug "#{sock.inspect} sock_id=#{sock.object_id} #{sid} is gone 2"
+          cs_logger.debug "#{sock.inspect} #{sid} is gone 2"
         end
         
       end
@@ -326,11 +339,17 @@ class DangoServerFramework
     Thread.abort_on_exception = true if @server_debug
     
     # 変数の初期設定
-    @connection_server_port            = @config['network']['port'] || 15000
-    @connection_server_host            = @config['server']['host'] || "localhost"
-    @connection_server_max_connections = @config['server']['max_connections'] || 10
+    @connection_server_port            = @config['network']['port'] || DefaultNetworkPort
+    @connection_server_host            = @config['server']['host'] || DefaultServerHost
+    @connection_server_max_connections = @config['server']['max_connections'] || DefaultMaxConnections
     @log_file                          = @config['server']['log_file'] || ""
     @policy_file_request               = @config['server']['policy_file_request'] || true
+    @send_receive_sleep_interval_sec   = @config['server']['send_receive_sleep_interval_sec'] || SendReceiveSleepIntervalSec
+    @send_receive_timeout_default_sec  = @config['server']['send_receive_timeout_default_sec'] || SendReceiveTimeoutDefaultSec
+    @send_timeout_sec                  = @config['server']['send_timeout_sec'] || SendTimeoutSec
+    @herat_beat_interval_sec           = @config['server']['heart_beat_interval_sec'] || HeartBeatIntervalSec
+    @heart_beat_response_wait_sec      = @config['server']['heart_beat_response_wait_sec'] || HeartBeatResponseWaitSec
+    
     
     log_level_hash = {
       "FATAL" => Logger::FATAL, 
@@ -516,17 +535,18 @@ class DangoServerFramework
     Thread.start do
       loop do
         begin
-          sleep HeratBeatIntervalSec
+          sleep @herat_beat_interval_sec
           
           if ! @gserver.stopped? # gserverが起動していれば
             cs_logger.debug "heart_beat_thread_start #{Time.now_to_s}"
             
-            # 全員へ空パケットを送信
+            # 全員へheart_beatパケットを送信
             socket_list.keys.each do |sid|
-              sock = socket_list[sid]
-              cs_logger.debug "heart_beat_thread_start:sid=#{sid} #{sock} #{sock.closed?}"
+#              sock = socket_list[sid]
+#              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})
+              cs_logger.debug "heart_beat_thread_start:sid=#{sid}"
+              cs_server_send_data(sid, "_heart_beat", {}, {:timeout=>@heart_beat_response_wait_sec})
             end
           end
           
@@ -544,11 +564,11 @@ class DangoServerFramework
     
     raise(DangoFrameworkError, "send_obj is not Hash.") if ! send_obj.is_a?(Hash)
     
-    timeout = options[:timeout] || SendReceiveTimeoutDefaultSec
+    timeout = options[:timeout] || @send_receive_timeout_default_sec
     dtype = options[:type] || 0
     
     sock = socket_list[sid]
-    if !sock # sockがないという事はすでに切断済み
+    if !sock || sock.closed? # sockがないという事はすでに切断済み
       cs_logger.info "cs_server_send_data:already closed socket. sid=#{sid.inspect} sock=#{sock.inspect} #{Time.now_to_s}"
       return
     end
@@ -591,7 +611,7 @@ class DangoServerFramework
             end
             
             # データ送信スレッドの終了待ち
-            if !receive_thread.join(SendTimeoutSec)
+            if !receive_thread.join(@send_timeout_sec)
               # タイムアウトの場合は
               cs_logger.warn "cs_server_send_data:send timeout:#{notice_name} #{sid} #{Time.now_to_s}" 
             else
@@ -600,7 +620,7 @@ class DangoServerFramework
               
               # タイムアウトチェック
               catch(:send_timeout) do
-                (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
+                (timeout.to_f / @send_receive_sleep_interval_sec).to_i.times do
                   if Time.now > end_reserved_time
                     cs_logger.debug "cs_server_send_data:receive timeout:#{notice_name}" 
                     
@@ -611,7 +631,7 @@ class DangoServerFramework
                     break
                   end
                   
-                  @mutex_send_response.synchronize do
+                  @mutex_send_response.synchronize do # データ送信の返信が来たかどうかの確認
                     find_res = @arr_send_response.find{|r| r[:_id] == send_obj_dup["_id"]}
                     
                     if find_res
@@ -623,7 +643,7 @@ class DangoServerFramework
                     end
                   end
                   
-                  sleep SendReceiveSleepIntervalSec # スリープ
+                  sleep @send_receive_sleep_interval_sec # スリープ
                 end # タイムアウト処理終わり
               end # catch 終わり
               

data/lib/dango/shared/memory_store.rb

@@ -51,7 +51,8 @@ module DangoFrameworkModule
     
     def [](key)
       if !@mutex.has_key?(key) # 未定義キーならエラー
-        raise(DangoFrameworkError, "Shared key is not exist.")
+        return(nil)
+#        raise(DangoFrameworkError, "Shared key is not exist.")
       end
       
       # ロックしてデータを読む

data/lib/dango/socket_list.rb

@@ -37,7 +37,7 @@ class SocketList
   
   def []=(key, sock)
     @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) 
       raise("sock(#{sock.inspect}) is not Socket") if sock.kind_of?(Socket)
       @sl_hash[key] = sock
     end

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 24
+    TINY  = 25
 
     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.24
-date: 2007-10-30 00:00:00 +09:00
+  version: 0.0.25
+date: 2007-10-31 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib
@@ -68,5 +68,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: