dango 0.3.6 → 0.3.8

data/lib/dango/client_framework.rb

@@ -64,7 +64,7 @@ class DangoClientFramework
     rescue
       message = "failed in dango_client_init. #{error_message($!, 'u')}"
       logger.error message
-      raise DangoError, message
+      raise DangoFrameworkException, message
     end
     
     @log_file      = @connection_client_log_file
@@ -74,6 +74,10 @@ class DangoClientFramework
     
     # loggerの準備
     logger.debug("-------client initialize host=#{@connection_client_host} port=#{@connection_client_port}")
+    logger.info("@log_file      = #{@log_file}")
+    logger.info("@log_level     = #{@log_level}")
+    logger.info("@log_max_size  = #{@log_max_size}")
+    logger.info("@log_shift_age = #{@log_shift_age}")
     
     # データ送受信用の共有メモリ初期化
     send_return_shared_init()
@@ -90,7 +94,7 @@ class DangoClientFramework
     begin
       @sock = TCPSocket.new(@connection_client_host, @connection_client_port)
     rescue Errno::EBADF, Exception
-      raise DangoFrameworkConnectionError
+      raise DangoFrameworkConnectionException
     end
     
     @sock.binmode
@@ -125,26 +129,27 @@ class DangoClientFramework
             ret_objs = nil
             begin
               ret_objs = dango_receive_data(@sock) # データ受信処理
-            rescue DangoFrameworkConnectionError
+            rescue DangoFrameworkConnectionException
               logger.debug "sock error #{@sid}:#{error_message($!, 'u')}"
               throw(:session_closed)
-            rescue DangoFrameworkError
+            rescue DangoFrameworkException
               logger.debug "sock error #{@sid}:#{error_message($!, 'u')}"
               throw(:session_closed)
             end
             logger.debug "finished dango_receive_data:#{ret_objs.inspect} #{@sid}"
             
             ret_objs.each do |ret_obj|  # 受信データひとつごとに処理
-              if !(ret_obj && ret_obj["notice"])
-                logger.info "no notice:#{ret_obj["notice"].inspect} #{@sid}"
+              if !(ret_obj && ret_obj["_notice_name"])
+                logger.info "no notice_name:#{ret_obj.inspect} #{@sid}"
               end
               
               # メソッド呼び出し
-              logger.info "calling method=#{ret_obj["notice"].inspect} #{@sid} "
+              notice_name = ret_obj["_notice_name"]
+              logger.info "calling method=#{notice_name.inspect} #{@sid} "
               begin
-                __send__("dango_receive_#{ret_obj["notice"]}", ret_obj)
+                __send__("dango_receive_#{notice_name}", ret_obj)
               rescue
-                logger.error "error in dango_receive_#{ret_obj["notice"]} #{@sid} \n#{error_message($!, 'u')}"
+                logger.error "error in dango_receive_#{notice_name} #{@sid} \n#{error_message($!, 'u')}"
               ensure
                 # データの受信の送信返し
                 response_notice_name = "_response"
@@ -152,7 +157,7 @@ class DangoClientFramework
                 send_action(response_notice_name, send_obj)
                 logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid} "
               end
-              logger.debug "called method=#{ret_obj["notice"].inspect} #{@sid} "
+              logger.debug "called method=#{notice_name.inspect} #{@sid} "
             end
             
           else
@@ -207,7 +212,7 @@ class DangoClientFramework
   # 必要に応じて追加するメソッド
   def method_missing(name, *args)
     logger.info "method not found. #{name.inspect} #{args.inspect}"
-    raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
+    raise(NoMethodError, "method not found. #{name.inspect} #{args.inspect}")
   end
   
   # ユーザーが終了させたい時に呼び出すメソッド（セッションを切る）
@@ -254,7 +259,7 @@ class DangoClientFramework
   def send_action(action_name, send_obj)
     logger.debug "send_action(#{action_name.inspect}, #{send_obj['_id']}) "
     send_obj_dup = send_obj.dup
-    send_obj_dup["action"] = action_name.to_s
+    send_obj_dup["_action_name"] = action_name.to_s
     dango_send_data(@sock, [send_obj_dup])
   end
   
@@ -289,7 +294,7 @@ class DangoClientFramework
       
       # タイムアウトチェック
       (timeout.to_f / SendReceiveSleepIntervalSec).to_i.times do
-        raise(DangoFrameworkTimeoutError, "timeout:#{action_name}") if Time.now > end_reserved_time
+        raise(DangoFrameworkTimeoutException, "timeout:#{action_name}") if Time.now > end_reserved_time
         
         # 送信スレッドが開始していなければ開始
         if !receive_thread
@@ -308,7 +313,7 @@ class DangoClientFramework
       end
       
       if !send_return_shared[action_name] # 戻ってきたデータがあるかどうかチェック
-        raise(DangoFrameworkError, "received data is none") 
+        raise(DangoFrameworkException, "received data is none") 
       end
       
       send_return_shared[action_name]

data/lib/dango/framework_base.rb

@@ -51,13 +51,13 @@ class Time
 end
 
 # 例外定義
-class DangoFrameworkError < StandardError; end
-class DangoFrameworkTimeoutError < DangoFrameworkError; end
-class DangoFrameworkConnectionError < DangoFrameworkError; end
-class DangoFrameworkDisconnectError < DangoFrameworkError; end
-class DangoFrameworkReadNoDataError < DangoFrameworkError; end
-class DangoFrameworkFlashPolicyError < DangoFrameworkError; end
-class DangoFrameworkMonitorSecurityError < DangoFrameworkError; end
+class DangoFrameworkException < StandardError; end
+class DangoFrameworkTimeoutException < DangoFrameworkException; end
+class DangoFrameworkConnectionException < DangoFrameworkException; end
+class DangoFrameworkDisconnectException < DangoFrameworkException; end
+class DangoFrameworkReadNoDataException < DangoFrameworkException; end
+class DangoFrameworkFlashPolicyException < DangoFrameworkException; end
+class DangoFrameworkMonitorSecurityException < DangoFrameworkException; end
 
 # エラー出力用モジュール
 module ErrorMessage
@@ -101,7 +101,7 @@ module DangoFrameworkModule
   
   CommMaxDigit = 5                 # 通信の最大桁数
   MaxLenRecv   = 1024              # 通信の一度の送信バイト数
-  MaxLenSend   = 1024              # 通信の一度の送信バイト数
+  MaxLenSend   = 1024 * 1024       # 通信の一度の送信バイト数
   
   EncodeTypeJSON = 0                  # エンコードのタイプのJSON
   EncodeTypeYAML = 1                  # エンコードのタイプのYAML
@@ -126,7 +126,16 @@ module DangoFrameworkModule
   def logger
 #   if !@dango_logger                                            # これだと警告が出てうざいので
     if !self.instance_variables.find{|iv| iv == '@dango_logger'} # @dango_loggerが未定義なら
-      if @log_file != ""
+      
+      if @log_file == "" # ログを取らない設定の場合は
+        @dango_logger = "LOG NONE"
+        def @dango_logger.fatal(str); end
+        def @dango_logger.error(str); end
+        def @dango_logger.info(str) ; end
+        def @dango_logger.warn(str) ; end
+        def @dango_logger.debug(str); end
+        
+      else               # ログを取る設定の場合は
         log_dir = File.dirname(@log_file)
         Dir.mkdir(log_dir) if !File.exist?(log_dir)
         @dango_logger = Logger.new(@log_file, @log_shift_age, @log_max_size)
@@ -156,15 +165,14 @@ module DangoFrameworkModule
 #      size_str = sock.sysread(CommMaxDigit + 1)
       size_str = sock.recv(CommMaxDigit + 1)
     rescue EOFError, IOError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNABORTED
-      # 接続終了時の切断と思われるものはDangoFrameworkConnectionErrorにしない
-      #raise(DangoFrameworkError, "failed to read sock for EOF reached.\n#{error_message($!, 'u')}")
-      raise(DangoFrameworkDisconnectError, "failed to read sock for EOF reached (and so on). sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
+      # 接続終了時の切断と思われるものはDangoFrameworkConnectionExceptionにしない
+      raise(DangoFrameworkDisconnectException, "failed to read sock for EOF reached (and so on). sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
     rescue
-      raise(DangoFrameworkConnectionError, "failed to read sock. sock=#{sock.inspect} toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
+      raise(DangoFrameworkConnectionException, "failed to read sock. sock=#{sock.inspect} toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
     end
     
     if size_str == ""
-      raise(DangoFrameworkReadNoDataError, "toid=#{Thread.current.object_id}:size_str=#{size_str.inspect}") 
+      raise(DangoFrameworkReadNoDataException, "toid=#{Thread.current.object_id}:size_str=#{size_str.inspect}") 
     end
     
     ## Flash のpolicyファイルだった場合（特殊）
@@ -172,7 +180,7 @@ module DangoFrameworkModule
       logger.debug "size_str=#{size_str.inspect}"
       receive_data = sock.recv(18)
       logger.info "flash policy file: dango_receive_data:receive_data=#{receive_data}"
-      raise(DangoFrameworkFlashPolicyError) 
+      raise(DangoFrameworkFlashPolicyException) 
     end
     
     ## サイズとデータタイプを取得
@@ -180,12 +188,12 @@ module DangoFrameworkModule
     
     ## データがない場合
     if size == nil || size == 0
-      raise(DangoFrameworkConnectionError, "toid=#{Thread.current.object_id}:size=#{size}:size_str=#{size_str.inspect}") 
+      raise(DangoFrameworkConnectionException, "toid=#{Thread.current.object_id}:size=#{size}:size_str=#{size_str.inspect}") 
     end
     
     ## データが大きすぎる場合
     if size >= 1886350441
-      raise(DangoFrameworkConnectionError, "too big... size=#{size}:size_str=#{size_str.inspect}")
+      raise(DangoFrameworkConnectionException, "too big... size=#{size}:size_str=#{size_str.inspect}")
     end
     
 #    logger.debug "size=#{size}:size_str=#{size_str.inspect}"
@@ -199,7 +207,7 @@ module DangoFrameworkModule
 #        this_ret_data_orig = sock.sysread(read_len)
         this_ret_data_orig = sock.recv(read_len)
       rescue
-        raise(DangoFrameworkConnectionError, "failed to read sock(data).\n#{error_message($!, 'u')}")
+        raise(DangoFrameworkConnectionException, "failed to read sock(data).\n#{error_message($!, 'u')}")
       end
       
       ret_data_orig += this_ret_data_orig
@@ -227,7 +235,7 @@ module DangoFrameworkModule
         data = Marshal.load(ret_data)
       end
     rescue
-      raise(DangoFrameworkConnectionError, "data parse error.#{$!.class}\nret_data=#{ret_data}")
+      raise(DangoFrameworkConnectionException, "data parse error.#{$!.class}\nret_data=#{ret_data}")
     end
   end
   
@@ -261,8 +269,9 @@ module DangoFrameworkModule
     size = send_data.size
     
 #    if size >= 4294967296 # 本当はuint最大値なんだけれど、policyファイルの都合で変えてある
-    if size >= 1886350440
-      raise(DangoFrameworkError, "max size over. size:#{size} >= 1886350440") 
+#    if size >= 1886350440 
+    if size >= MaxLenSend
+      raise(DangoFrameworkException, "max size over. size:#{size} >= #{MaxLenSend}") 
     end
     
 #    size_str = sprintf("%0#{CommMaxDigit}d", size)
@@ -281,7 +290,7 @@ module DangoFrameworkModule
 #      sock.flush
 
     rescue
-      raise(DangoFrameworkConnectionError, "sock write failed.\n#{error_message($!, 'u')}")
+      raise(DangoFrameworkConnectionException, "sock write failed.\n#{error_message($!, 'u')}")
     end
     
     @send_count += 1 if @send_count # 受信回数カウント

data/lib/dango/monitor/dango_monitor_client.rb

@@ -39,9 +39,9 @@ class DangoMonitorClient < DangoClientFramework
       logger.debug "get_server_info_common:ret_obj=#{ret_obj.inspect}"
       raise("code is not 0 (faild). :code=#{ret_obj['code']}") if ret_obj['code'] != 0
       return(ret_obj[monitor_action_name])
-    rescue DangoFrameworkConnectionError
+    rescue DangoFrameworkConnectionException
       raise("#{monitor_action_name} Connection error")
-    rescue DangoFrameworkTimeoutError
+    rescue DangoFrameworkTimeoutException
       raise("#{monitor_action_name} Timeout error")
     ensure
       dango_client_close
@@ -75,9 +75,9 @@ class DangoMonitorClient < DangoClientFramework
       ret_obj = send_action_return_notice('_monitor_server_reload', {})
       raise("code is not 0 (faild). :code=#{ret_obj['code']}") if ret_obj['code'] != 0
       return(true)
-    rescue DangoFrameworkConnectionError
+    rescue DangoFrameworkConnectionException
       raise("monitor_server_reload Connection error")
-    rescue DangoFrameworkTimeoutError
+    rescue DangoFrameworkTimeoutException
       raise("monitor_server_reload Timeout error")
     ensure
       dango_client_close
@@ -91,9 +91,9 @@ class DangoMonitorClient < DangoClientFramework
       ret_obj = send_action_return_notice('_monitor_send_system_message', {:message=>message})
       raise("code is not 0 (faild). :code=#{ret_obj['code']}") if ret_obj['code'] != 0
       return(true)
-    rescue DangoFrameworkConnectionError
+    rescue DangoFrameworkConnectionException
       raise("monitor_send_system_message Connection error")
-    rescue DangoFrameworkTimeoutError
+    rescue DangoFrameworkTimeoutException
       raise("monitor_send_system_message Timeout error")
     ensure
       dango_client_close

data/lib/dango/server_framework.rb

@@ -128,7 +128,7 @@ class DangoServerFramework
     
     # 終了処理を登録しておく(これが無いとWindowsではエラーが出てもプロセスが落ちないことがある)
     at_exit do
-      logger.error "at_exit ERROR\n#{caller(0).pretty_inspect}"
+      logger.info "at_exit ERROR\n#{caller(0).pretty_inspect}"
       stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
@@ -335,7 +335,7 @@ class DangoServerFramework
         begin
           ret_objs = dango_receive_data(sock) # データ受信処理
           is_flash_policy_file = false
-        rescue DangoFrameworkFlashPolicyError
+        rescue DangoFrameworkFlashPolicyException
           is_flash_policy_file = true
         end
         
@@ -366,20 +366,20 @@ EOF
           
           # この部分はポリシーファイルを返す設定に関係なく実行する部分
           sleep 0.1
-          raise(DangoFrameworkFlashPolicyError, "requested policy file. disconnectiong...")
+          raise(DangoFrameworkFlashPolicyException, "requested policy file. disconnectiong...")
           
         elsif ret_objs == [] # 受信データがなければ
 #          logger.debug "ret_objs is empty. "
           
         else # 受信データがあれば
           ret_objs.each do |ret_obj| # 受信データループ
-            if !(ret_obj && ret_obj["action"]) # actionが無い場合はエラー
-              logger.warn "no action error:#{ret_obj.inspect}"
-              raise(DangoFrameworkError, "no action error") 
+            if !(ret_obj && ret_obj["_action_name"]) # action_nameが無い場合はエラー
+              logger.warn "no action_name error:#{ret_obj.inspect}"
+              raise(DangoFrameworkException, "no action_name error") 
             end
             
             # アクション名
-            action_name = ret_obj["action"].to_s
+            action_name = ret_obj["_action_name"].to_s
             session[:_action_name] = action_name
             
             # 自動返信用データ
@@ -431,25 +431,25 @@ EOF
         
       end # loop
       
-    rescue DangoFrameworkFlashPolicyError
+    rescue DangoFrameworkFlashPolicyException
       logger.info "Flash policy file #{sid} "
       
-    rescue DangoFrameworkMonitorSecurityError
+    rescue DangoFrameworkMonitorSecurityException
       logger.warn "Monitor Security Error #{sid} "
       
-    rescue DangoFrameworkReadNoDataError
+    rescue DangoFrameworkReadNoDataException
       @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
       logger.debug "read no data. maybe client closed. #{sid} "
       
-    rescue DangoFrameworkConnectionError
+    rescue DangoFrameworkConnectionException
       @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
       logger.debug "connection error. #{sid} \n#{error_message($!, 'u')}"
       
-    rescue DangoFrameworkDisconnectError
-      logger.debug "DangoFrameworkDisconnectError. #{sid} \n#{error_message($!, 'u')}"
+    rescue DangoFrameworkDisconnectException
+      logger.debug "DangoFrameworkDisconnectException. #{sid} \n#{error_message($!, 'u')}"
       
-    rescue DangoFrameworkError
-      logger.debug "DangoFrameworkError. #{sid} \n#{error_message($!, 'u')}"
+    rescue DangoFrameworkException
+      logger.debug "DangoFrameworkException. #{sid} \n#{error_message($!, 'u')}"
       
     rescue Exception
       logger.error "Exception #{sid} #{error_message($!, 'u')}"
@@ -472,8 +472,9 @@ EOF
 #            sock.close if !sock.closed?           # ソケットを閉じる
             sock.close            # ソケットを閉じる
           rescue IOError
-#            logger.error "IOError #{sock} #{sid}"
-            logger.error "#{sock.inspect} #{sid} ERROR\n#{error_message($!, 'u')}"
+            logger.info "IOError #{sock.inspect} #{sid}"
+          rescue Exception
+            logger.error "#{sock.inspect} #{sid} Exception\n#{error_message($!, 'u')}"
           end
           
           logger.info "#{sock.inspect} #{sid} is closed"
@@ -705,6 +706,8 @@ EOF
 #                sock.close if !sock.closed?
                 begin
                   sock.close
+                rescue IOError
+                  logger.debug "heart_beat_thread_start:maybe already closed. IOError:#{sid}:#{sock}"
                 rescue
                   logger.warn "heart_beat_thread_start:failed close socket:#{error_message($!, 'u')}"
                 end
@@ -736,7 +739,7 @@ EOF
   
   # クライアントから来たheart_beatなら
   def dango_receive__notice_heart_beat(ret_obj)
-#    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]}:#{ret_obj['_hb_id']} " 
+    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]}:#{ret_obj['_hb_id']} " 
     
     shared.transaction(:_heart_beat_time_hash) do |heart_beat_time_hash|
       heart_beat_time_hash[session[:sid]] = Time.now
@@ -748,8 +751,8 @@ EOF
   def send_return(send_obj, options = {})
     logger.info "send_return(#{session[:sid].inspect}) "
     
-    raise(DangoFrameworkError, "session[:sid] is not exist.") if ! session[:sid]
-    raise(DangoFrameworkError, "session[:_action_name] is not exist.") if ! session[:_action_name]
+    raise(DangoFrameworkException, "session[:sid] is not exist.") if ! session[:sid]
+    raise(DangoFrameworkException, "session[:_action_name] is not exist.") if ! session[:_action_name]
     
     send_notice("return_#{session[:_action_name]}", session[:sid], send_obj, options)
   end
@@ -758,17 +761,17 @@ EOF
   def send_notice(notice_name, sids, send_obj, options = {})
     logger.info "send_notice(#{notice_name.inspect}, #{sids.inspect}) "
     
-    raise(DangoFrameworkError, "send_obj is not Hash.") if ! send_obj.is_a?(Hash)
+    raise(DangoFrameworkException, "send_obj is not Hash.") if ! send_obj.is_a?(Hash)
     
     sids = [sids] if sids.is_a?(Integer)
-    raise(DangoFrameworkError, "sids is not Array.") if ! sids.is_a?(Array)
+    raise(DangoFrameworkException, "sids is not Array.") if ! sids.is_a?(Array)
     
 #    timeout = options[:timeout] || @send_receive_timeout_default_sec
     encode_type = options[:encode_type] || 0
     
     send_obj_dup = send_obj.deep_dup
-    send_obj_dup["notice"] = notice_name.to_s
-    send_obj_dup["server_time"] = Time.now_to_s
+    send_obj_dup["_notice_name"] = notice_name.to_s
+    send_obj_dup["_server_time"] = Time.now_to_s
     
     sids.each do |sid|
 #      send_id = Digest::MD5.hexdigest(sid.to_s + notice_name.to_s + Time.now.to_f.to_s + rand().to_s)
@@ -779,8 +782,6 @@ EOF
       @queue_send_notice.push([sid, send_obj_dup, encode_type].deep_dup)
     end # end sids.each
     
-#    raise(DangoFrameworkConnectionError, "send_notice:error happened.") if is_error
-    
     self
   end
   
@@ -826,13 +827,13 @@ EOF
           end
           
           begin
-            logger.debug "thread_send_notice_queue:dango_send_data:sid=#{sid} sock=#{sock.inspect} #{one_send_data_list.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_name'] + ','}}"
 #            logger.debug "thread_send_notice_queue:one_send_data_list=#{one_send_data_list.inspect}"
 #            logger.debug one_send_data_list.pretty_inspect
             
             dango_send_data(sock, one_send_data_list, :type=>send_data_encode_type_list[sid]) # データ送信
             
-          rescue DangoFrameworkConnectionError
+          rescue DangoFrameworkConnectionException
             logger.info "thread_send_notice_queue:failed send. sid=#{sid} sock=#{sock.inspect} #{$!.class}"
           end
         end
@@ -851,8 +852,8 @@ EOF
       key = $1
       method_action_notice_shared(key, name, *args)
     else
-      logger.error "method not found. #{name.inspect} #{args.inspect}"
-      raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
+#      logger.error "method not found. #{name.inspect} #{args.inspect}"
+      raise(NoMethodError, "method not found. #{name.inspect} #{args.inspect}")
     end
   end
   

data/lib/dango/shared/memory_store.rb

@@ -28,7 +28,7 @@ module DangoFrameworkModule
     
     def transaction(key) # トランザクション処理ブロックを作る
       if !@mutex.has_key?(key) # 未定義キーならエラー
-        raise(DangoFrameworkError, "Shared key is not exist.")
+        raise(DangoFrameworkException, "Shared key is not exist.")
       end
       @mutex[key].synchronize do
 #        data = yield(@data[key].deep_dup)
@@ -39,7 +39,7 @@ module DangoFrameworkModule
     
     def synchronize(key) # 排他処理ブロック用
       if !@mutex.has_key?(key) # 未定義キーならエラー
-        raise(DangoFrameworkError, "Shared key is not exist.")
+        raise(DangoFrameworkException, "Shared key is not exist.")
       end
       @mutex[key].synchronize do
         yield
@@ -53,7 +53,7 @@ module DangoFrameworkModule
     def [](key)
       if !@mutex.has_key?(key) # 未定義キーならエラー
         return(nil)
-#        raise(DangoFrameworkError, "Shared key is not exist.")
+#        raise(DangoFrameworkException, "Shared key is not exist.")
       end
       
       # ロックしてデータを読む
@@ -70,7 +70,7 @@ module DangoFrameworkModule
     def []=(key, value)
       # キーはString Symbolのみ
       if key.class != String && key.class != Symbol
-        raise(DangoFrameworkError, "Shared key is not String or Symbol.")
+        raise(DangoFrameworkException, "Shared key is not String or Symbol.")
       end
       
       # 未定義なら定義する

data/lib/dango/tasks/dango_rake.rb

@@ -97,6 +97,11 @@ def check_dango_connect()
   serv_info = {}
   serv_info["host"] = config['network']['host'] || 'localhost'
   serv_info["port"] = config['network']['port'] || 15000
+  serv_info["log_file"] = ""
+  serv_info["log_level"] = Logger::WARN
+  serv_info["log_max_size"] = 10000000
+  serv_info["log_shift_age"] = 10
+
 #  pp serv_info
   
   tester = DangoTesterClient.new # 開始
@@ -166,6 +171,7 @@ namespace :dango do
       stop_process(pid) if pid # pidがあればプロセス停止
     end
     
+    # サーバーが止まっているので起動処理をかける
     if check_dango_process_cmd && ((! is_pid_exist) || (! is_alive_server)) 
       puts "check_dango_process_cmd=#{check_dango_process_cmd}" if $is_verbose
       system(check_dango_process_cmd)

data/lib/dango/tester/dango_tester_client.rb

@@ -16,10 +16,12 @@ class DangoTesterClient
   ReceiveCacheAutoDeleteSec = 30.0    # receive_cacheを自動で消すタイミング
 
   # テスターのイニシャライズ
-  def initialize(debug = false)
-    @debug = debug
+  def initialize(options = {})
+    options = {:debug => true} if options.class != Hash
     
-    original_print("Dango Version=#{Dango::VERSION::STRING}\n") if debug
+    @debug = options[:debug]
+    
+    original_print("Dango Version=#{Dango::VERSION::STRING}\n") if @debug
     
     @client_conns = {}
     Thread.abort_on_exception = true
@@ -61,8 +63,14 @@ class DangoTesterClient
         "port"=>serv_info["port"],
       }, 
       "tester" => {
-        "receive_cache_auto_delete_sec"=> serv_info["receive_cache_auto_delete_sec"] || ReceiveCacheAutoDeleteSec,
-      }
+        "receive_cache_auto_delete_sec" => serv_info["receive_cache_auto_delete_sec"] || ReceiveCacheAutoDeleteSec,
+      },
+      "log" => {
+        "log_file"      => serv_info["log_file"] || "log/tester_#{Process.pid}_#{c_name}.log",
+        "log_level"     => serv_info["log_level"] || Logger::INFO,
+        "log_max_size"  => serv_info["log_max_size"] || 10000000,
+        "log_shift_age" => serv_info["log_shift_age"] || 99,
+      },
     }
     env = ENV['RAILS_ENV'] || 'development'
     
@@ -76,7 +84,7 @@ class DangoTesterClient
         client_conn = nil
         raise("connection error for retry times over.") if i == ConnectionRetryTimes - 1
         puts "#{$!.class} #{$!.message} #{$!.backtrace.inspect}" if @debug
-        puts "connection failed. sleep #{ConnectionRetryIntervalSec}"
+        puts "connection failed. sleep #{ConnectionRetryIntervalSec}. #{$!.class}"
         sleep ConnectionRetryIntervalSec
       end
     end
@@ -190,10 +198,10 @@ class TestClient < DangoClientFramework
     @connection_client_port = @config["network"]["port"] # 自動でこのポートでサーバー開始
     
     # ログ出力情報
-    @connection_client_log_file = "log/tester_#{Process.pid}_#{@client_name}.log"
-    @connection_client_log_level = Logger::DEBUG
-    @connection_client_log_max_size = 10000000
-    @connection_client_log_shift_age = 99
+    @connection_client_log_file  = @config["log"]["log_file"]
+    @connection_client_log_level = @config["log"]["log_level"]
+    @connection_client_log_max_size = @config["log"]["log_max_size"]
+    @connection_client_log_shift_age = @config["log"]["log_shift_age"]
   end
   
   # テストサーバー
@@ -214,7 +222,7 @@ class TestClient < DangoClientFramework
       
     else
       logger.info "method not found. #{name.inspect} #{args.inspect}"
-      raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
+      raise(NoMethodError, "method not found. #{name.inspect} #{args.inspect}")
     end
   end
   
@@ -254,7 +262,7 @@ class TestClient < DangoClientFramework
     
     # タイムアウトなら
     if receive_data == nil
-      raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}: \n client_name=#{@client_name}(#{self.sid}) \n :notice_name=#{notice_name} \n") 
+      raise(DangoFrameworkTimeoutException, "timeout:timeout_sec=#{timeout}: \n client_name=#{@client_name}(#{self.sid}) \n :notice_name=#{notice_name} \n") 
     end
     
     # 結果を削除しておく

data/lib/dango/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 +09:00
+date: 2008-08-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency