dango 0.0.32 → 0.0.34

data/lib/dango/client_framework.rb

@@ -59,7 +59,7 @@ class DangoClientFramework
     @log_level = @connection_client_log_level
     
     # loggerの準備
-    logger.debug("-------client initialize")
+    logger.debug("-------client initialize host=#{@connection_client_host} port=#{@connection_client_port}")
     
     # データ送受信用の共有メモリ初期化
     send_return_shared_init()
@@ -75,7 +75,7 @@ class DangoClientFramework
     # サーバーへ接続
     begin
       @sock = TCPSocket.new(@connection_client_host, @connection_client_port)
-    rescue Errno::EBADF
+    rescue Errno::EBADF, Exception
       raise DangoFrameworkConnectionError
     end
     
@@ -119,19 +119,19 @@ class DangoClientFramework
             end
             
             # メソッド呼び出し
-            logger.info "calling method=#{ret_obj["notice"].inspect} #{@sid} #{Time.now_to_s}"
+            logger.info "calling method=#{ret_obj["notice"].inspect} #{@sid} "
             begin
               __send__("dango_receive_#{ret_obj["notice"]}", ret_obj)
             rescue
-              logger.error "error in dango_receive_#{ret_obj["notice"]} #{@sid} #{Time.now_to_s}\n#{error_message($!, 'u')}"
+              logger.error "error in dango_receive_#{ret_obj["notice"]} #{@sid} \n#{error_message($!, 'u')}"
             ensure
               # データの受信の送信返し
               response_notice_name = "_response"
               send_obj = {"_id" => ret_obj["_id"]}
               send_action(response_notice_name, send_obj)
-              logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid} #{Time.now_to_s}"
+              logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid} "
             end
-            logger.debug "called method=#{ret_obj["notice"].inspect} #{@sid} #{Time.now_to_s}"
+            logger.debug "called method=#{ret_obj["notice"].inspect} #{@sid} "
             
           else
             sleep 0.01
@@ -155,13 +155,13 @@ class DangoClientFramework
           sleep HeartBeatSendIntervalSec
           
           if @sock && ! @sock.closed?
-            logger.debug "dango_heart_beat_thread_init:send _notice_heart_beat:#{Time.now_to_s}"
+            logger.debug "dango_heart_beat_thread_init:send _notice_heart_beat:"
             
             send_action("_notice_heart_beat", {})
           end
           
         rescue
-          logger.error "Exception dango_heart_beat_thread_init #{Time.now_to_s} #{error_message($!, 'u')}"
+          logger.error "Exception dango_heart_beat_thread_init  #{error_message($!, 'u')}"
         end
       end
     end
@@ -203,7 +203,7 @@ class DangoClientFramework
       @sock = nil
       
       @is_session_closed = true
-      logger.info "calling dango_session_closed():#{Time.now_to_s}"
+      logger.info "calling dango_session_closed():"
       dango_session_closed() # セッションが切れると呼ばれる処理
       
       @is_close = true
@@ -229,7 +229,7 @@ class DangoClientFramework
   
   # クライアントからサーバーへのデータ送信
   def send_action(action_name, send_obj)
-    logger.debug "send_action(#{action_name.inspect}, #{send_obj['_id']}) #{Time.now_to_s}"
+    logger.debug "send_action(#{action_name.inspect}, #{send_obj['_id']}) "
     send_obj_dup = send_obj.dup
     send_obj_dup["action"] = action_name.to_s
     dango_send_data(@sock, send_obj_dup)

data/lib/dango/framework_base.rb

@@ -6,8 +6,9 @@
 
 require "rubygems"
 
-require 'logger'
+require 'resolv-replace' # 名前解決時のロックがかかってしまう件を解決できるはず
 require 'socket'
+require 'logger'
 require 'thread'
 require 'timeout'
 require 'yaml'
@@ -44,7 +45,7 @@ class Time
   def self.now_to_s
 #    self.strftime("%Y-%m-%d %H:%M:%S")
     now = self.now
-    now.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % now.usec
+    now.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d" % now.usec
   end
 end
 
@@ -113,21 +114,27 @@ module DangoFrameworkModule
   
   # ロガーの定義
   def logger
-#   if !@logger                                            # これだと警告が出てうざいので
-    if !self.instance_variables.find{|iv| iv == '@logger'} # @loggerが未定義なら
+#   if !@dango_logger                                            # これだと警告が出てうざいので
+    if !self.instance_variables.find{|iv| iv == '@dango_logger'} # @dango_loggerが未定義なら
       if @log_file != ""
         log_dir = File.dirname(@log_file)
         Dir.mkdir(log_dir) if !File.exist?(log_dir)
-        @logger = Logger.new(@log_file)
-        @logger.level = @log_level
-        @logger.datetime_format = "%Y-%m-%dT%H:%M:%S"
-#        @logger.datetime_format = "aaaaa"
-        @logger.progname = "toid=#{Thread.current.object_id}"
+        @dango_logger = Logger.new(@log_file)
+        @dango_logger.level = @log_level
+        def @dango_logger.format_message(severity, timestamp, msg, progname) 
+#          "#{Time.now_to_s}:#{sprintf('%1.1s', severity)}:#{progname}:#{msg}\n"
+#          "%s, [%s#%d] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), $$, severity, progname,msg2str(msg)]
+          now = Time.now
+          now_str = now.strftime("%Y-%m-%d %H:%M:%S.") << "%06d" % now.usec
+          "%1.1s, [%s] %d:%s %s\n" % [severity, now_str, Thread.current.object_id, progname, msg]
+        end
       end
     end
-    @logger
+    @dango_logger
   end
 
+  attr(:dango_logger)
+
   # データ受信処理
   def dango_receive_data(sock)
     ret_data = ""
@@ -264,7 +271,7 @@ module DangoFrameworkModule
     
     @send_count += 1 if @send_count # 受信回数カウント
 #    logger.debug "finish dango_send_data:#{send_data.inspect}"
-#    logger.debug "finish dango_send_data:#{Time.now_to_s}:toid=#{Thread.current.object_id} #{sock} #{sock.closed?}"
+#    logger.debug "finish dango_send_data:toid=#{Thread.current.object_id} #{sock} #{sock.closed?}"
 
     sock
   end

data/lib/dango/server_framework.rb

@@ -84,7 +84,6 @@ class DangoServerFramework
     set_server_variables()                # 各種サーバー仕様の変数設定
     
     logger.debug("===== server initialize =====") # loggerの準備
-    logger.debug("#{Time.now_to_s}")
     logger.debug("Process.pid=#{Process.pid}")
     logger.debug("port=#{@connection_server_port}")
     logger.debug("host=#{@connection_server_host}")
@@ -198,14 +197,13 @@ class DangoServerFramework
   
   # gserver接続開始処理
   def disconnecting(port)
-    logger.debug "disconnecting:port=#{port} #{Time.now_to_s}"
+    logger.debug "disconnecting:port=#{port}"
   end
   
   # gserverのserveメソッド：スレッド開始処理
   def thread_main(sock)
-    logger.debug "thread_main:start"
 #    logger.debug "#{sock} is accepted. thread.current=#{Thread.current.object_id} sock_id=#{sock.object_id}"
-    logger.debug "#{sock} is accepted. thread.current=#{Thread.current.object_id}"
+    logger.debug "#{sock} is accepted. thread.current=#{Thread.current.object_id} "
     
     begin
       sock.binmode
@@ -222,7 +220,7 @@ class DangoServerFramework
       # 接続直後のsid通知
       send_obj = {"_sid"=>sid}
       send_notice(sid, "_notice_sid", send_obj)
-      logger.debug "_notice_sid #{sid} #{Time.now_to_s}"
+      logger.debug "_notice_sid #{sid} "
       
       # 誰かが接続したときに60秒以上経った@arr_send_responseを削除
       @mutex_send_response.synchronize do
@@ -245,7 +243,7 @@ class DangoServerFramework
         end
         
         if is_flash_policy_file && @policy_file_request # Flashのポリシーファイルが来たら
-          logger.debug "is_flash_policy_file #{sid} #{Time.now_to_s}"
+          logger.debug "is_flash_policy_file #{sid} "
           policy_data = '<?xml version="1.0"?><cross-domain-policy><allow-access-from domain="*" to-ports="*" /></cross-domain-policy>' + "\0" + "\n"
           logger.debug policy_data
           sock.write policy_data
@@ -254,7 +252,7 @@ class DangoServerFramework
           raise(DangoFrameworkFlashPolicyError, "policy file sent. disconnectiong...")
           
         elsif ret_obj == {} # 受信データがなければ
-#          logger.debug "ret_obj is empty. #{Time.now_to_s}"
+#          logger.debug "ret_obj is empty. "
           
         else # 受信データがあれば
           if !(ret_obj && ret_obj["action"]) # actionが無い場合はエラー
@@ -268,14 +266,14 @@ class DangoServerFramework
           @mutex_proc_thread.synchronize do
             
             if action_name == '_response' # 送信パケットの返事なら
-#              logger.debug "action_name=#{action_name} #{ret_obj['_id']} #{Time.now_to_s}"
+#              logger.debug "action_name=#{action_name} #{ret_obj['_id']} "
               action_name_is_response(ret_obj)
               
             elsif action_name[0, 9] == '_monitor_' # メンテナンスアクション名なら
               ServerMonitorAction.new(self, @config, sock, ret_obj)
               
             else # メンテナンスコマンド以外のユーザーアクション名なら
-              logger.debug "receive_action:#{sid}:#{action_name}:#{Time.now_to_s}"
+              logger.debug "receive_action:#{sid}:#{action_name}:"
               begin
                 __send__("dango_receive_#{action_name}", ret_obj)
               rescue NoMethodError
@@ -290,23 +288,23 @@ class DangoServerFramework
       end # loop
       
     rescue DangoFrameworkFlashPolicyError
-      logger.debug "Flash policy file send. #{sid} #{Time.now_to_s}"
+      logger.debug "Flash policy file send. #{sid} "
       
     rescue DangoFrameworkMonitorSecurityError
-      logger.debug "Monitor Security Error #{sid} #{Time.now_to_s}"
+      logger.debug "Monitor Security Error #{sid} "
       
     rescue DangoFrameworkReadNoDataError
-      logger.debug "read no data. maybe client closed. #{sid} #{Time.now_to_s}"
+      logger.debug "read no data. maybe client closed. #{sid} "
       
     rescue DangoFrameworkConnectionError
       @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
-      logger.debug "connection error. #{sid} #{Time.now_to_s}\n#{error_message($!, 'u')}"
+      logger.debug "connection error. #{sid} \n#{error_message($!, 'u')}"
       
     rescue DangoFrameworkError
-      logger.debug "DangoFrameworkError. #{sid} #{Time.now_to_s}\n#{error_message($!, 'u')}"
+      logger.debug "DangoFrameworkError. #{sid} \n#{error_message($!, 'u')}"
       
     rescue Exception
-      logger.error "Exception #{sid} #{Time.now_to_s} #{error_message($!, 'u')}"
+      logger.error "Exception #{sid} #{error_message($!, 'u')}"
       
     ensure
       logger.debug "#{sock.inspect} #{sid} is gone"
@@ -335,7 +333,7 @@ class DangoServerFramework
   
   # action_nameが送信パケットの返事なら
   def action_name_is_response(ret_obj)
-    logger.debug "action_name_is_response: #{ret_obj['_id']} #{session[:sid]} #{Time.now_to_s}" 
+    logger.debug "action_name_is_response: #{ret_obj['_id']} #{session[:sid]} " 
     @mutex_send_response.synchronize do
       @arr_send_response.push({:_id => ret_obj["_id"], :time => Time.now})
     end
@@ -550,15 +548,15 @@ class DangoServerFramework
         begin
           sleep @gc_interval_sec
           
-          logger.debug "GC start #{Time.now_to_s}"
+          logger.debug "GC start "
           gc_start_time = Time.now
           GC.enable
           GC.start 
           GC.disable
-          logger.debug "GC end #{Time.now - gc_start_time}sec #{Time.now_to_s}"
+          logger.debug "GC end #{Time.now - gc_start_time}sec "
           
         rescue
-          logger.error "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
+          logger.error "Exception gc_thread_start  #{error_message($!, 'u')}"
         end
       end
     end
@@ -575,7 +573,7 @@ class DangoServerFramework
           sleep @herat_beat_interval_sec
           
           if ! @gserver.stopped? # gserverが起動していれば
-            logger.debug "heart_beat_thread_start #{Time.now_to_s}"
+            logger.debug "heart_beat_thread_start "
             
             # クライアントから来るハートビートのチェック
             heart_beat_time_hash = shared[:heart_beat_time_hash]
@@ -588,14 +586,14 @@ class DangoServerFramework
               
               # クライアントから来たハートビートの時間チェック
               if heart_beat_time_hash[sid] && heart_beat_time_hash[sid] < Time.now - @heart_beat_receive_wait_sec
-                logger.debug "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{Time.now_to_s}:#{sock}:#{sock.closed?}"
+                logger.debug "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{sock}:#{sock.closed?}"
                 sock.close if !sock.closed?
               end
             end
           end
           
         rescue
-          logger.error "Exception heart_beat_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
+          logger.error "Exception heart_beat_thread_start  #{error_message($!, 'u')}"
         end
       end
     end
@@ -604,7 +602,7 @@ class DangoServerFramework
   
   # クライアントから来たheart_beatなら
   def dango_receive__notice_heart_beat(ret_obj)
-    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]}:#{ret_obj['_hb_id']} #{Time.now_to_s}" 
+    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
@@ -614,7 +612,7 @@ class DangoServerFramework
   
   # サーバーからクライアントへのデータ送信
   def send_notice(sid, notice_name, send_obj, options = {})
-    logger.debug "send_notice(#{sid.inspect}, #{notice_name.inspect}) #{Time.now_to_s}"
+    logger.debug "send_notice(#{sid.inspect}, #{notice_name.inspect}) "
 #    logger.debug "send_notice(#{sid.inspect}, #{notice_name.inspect}, #{send_obj.inspect}, #{options.inspect})"
     
     raise(DangoFrameworkError, "send_obj is not Hash.") if ! send_obj.is_a?(Hash)
@@ -624,7 +622,7 @@ class DangoServerFramework
     
     sock = socket_list[sid]
     if !sock || sock.closed? # sockがないという事はすでに切断済み
-      logger.info "send_notice:already closed socket. sid=#{sid.inspect} sock=#{sock.inspect} #{sock ? sock.closed? : nil} #{Time.now_to_s}"
+      logger.info "send_notice:already closed socket. sid=#{sid.inspect} sock=#{sock.inspect} #{sock ? sock.closed? : nil} "
       return(self)
     end
     
@@ -648,7 +646,7 @@ class DangoServerFramework
           send_obj_dup["notice"] = notice_name.to_s
           
           mutex_socket_list.synchronize(sid) do
-#            logger.debug "mutex_socket_list:synchronize:#{notice_name} #{sid} #{Time.now_to_s}"
+#            logger.debug "mutex_socket_list:synchronize:#{notice_name} #{sid} "
             
             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)
@@ -657,20 +655,20 @@ class DangoServerFramework
             receive_thread = Thread.start(sock, send_obj_dup, dtype) do
               begin
                 dango_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
-#                logger.debug "send_notice:sent:notice_name=#{send_obj_dup['_id']} #{notice_name.inspect} #{sid} #{Time.now_to_s}"
+#                logger.debug "send_notice:sent:notice_name=#{send_obj_dup['_id']} #{notice_name.inspect} #{sid} "
               rescue DangoFrameworkConnectionError
-                logger.debug "send_notice:DangoFrameworkConnectionError:notice_name=#{notice_name.inspect} #{sid} #{Time.now_to_s}"
+                logger.debug "send_notice:DangoFrameworkConnectionError:notice_name=#{notice_name.inspect} #{sid} "
               rescue DangoFrameworkError
-                logger.debug "ERROR:send_notice:DangoFrameworkError:notice_name=#{notice_name.inspect} #{sid} #{Time.now_to_s}\n #{error_message($!, 'u')}"
+                logger.debug "ERROR:send_notice:DangoFrameworkError:notice_name=#{notice_name.inspect} #{sid} \n #{error_message($!, 'u')}"
               end
             end
             
             # データ送信スレッドの終了待ち
             if !receive_thread.join(@send_timeout_sec)
               # タイムアウトの場合は
-              logger.warn "send_notice:send timeout:#{notice_name} #{sid} #{Time.now_to_s}" 
+              logger.warn "send_notice:send timeout:#{notice_name} #{sid} " 
             else
-#              logger.warn "send_notice:sent after join:#{notice_name} #{sid} #{Time.now_to_s}" 
+#              logger.warn "send_notice:sent after join:#{notice_name} #{sid} " 
               end_reserved_time = Time.now + timeout
               
               # タイムアウトチェック
@@ -691,7 +689,7 @@ class DangoServerFramework
                   end
                   
                   if Time.now > end_reserved_time
-                    logger.debug "send_notice:receive timeout:#{notice_name} #{sid} #{Time.now_to_s} #{end_reserved_time}" 
+                    logger.debug "send_notice:receive timeout:#{notice_name} #{sid}  #{end_reserved_time}" 
                     
                     if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
                       logger.info "!!!! send_notice:heart_beat timeout" 
@@ -704,7 +702,7 @@ class DangoServerFramework
               end # catch 終わり
               
               if !have_came_response # 戻ってきたデータがあるかどうかチェック
-                logger.warn "!!! received data is none:#{notice_name} #{sid} #{send_obj_dup['_id']} #{Time.now_to_s}"
+                logger.warn "!!! received data is none:#{notice_name} #{sid} #{send_obj_dup['_id']} "
               end
             end
           end # mutex

data/lib/dango/tasks/dango_rake.rb

@@ -1,6 +1,8 @@
 # 環境変数設定
 ENV['RAILS_ENV'] = ENV['RAILS_ENV'] || 'development'
 
+require "pp"
+
 namespace :dango do
   desc "initialize dango"
   task :initialize do
@@ -71,13 +73,13 @@ namespace :dango do
       require 'dango/monitor/dango_monitor_client.rb'
       begin
         dm = DangoMonitorClient.new()
-        p dm.server_reload()
+        pp dm.server_reload()
         dm.dango_client_close
         puts "complete server_reload."
       rescue
-        p $!.class
-        p $!.message
-        p $!.backtrace
+        pp $!.class
+        pp $!.message
+        pp $!.backtrace
         puts "failed server_reload."
       end
     end
@@ -99,13 +101,13 @@ namespace :dango do
       
       begin
         dm = DangoMonitorClient.new()
-        p dm.send_system_message(message)
+        pp dm.send_system_message(message)
         dm.dango_client_close
         puts "complete send_system_message."
       rescue
-        p $!.class
-        p $!.message
-        p $!.backtrace
+        pp $!.class
+        pp $!.message
+        pp $!.backtrace
         puts "failed send_system_message."
       end
     end

data/lib/dango/tester/dango_tester_client.rb

@@ -137,13 +137,13 @@ class TestClient < DangoClientFramework
   
   # テストサーバー
   def send(name, send_obj = {})
-    logger.debug("tester.send:send_obj=#{send_obj.inspect} #{Time.now_to_s}")
+    logger.debug("tester.send:send_obj=#{send_obj.inspect} ")
     send_action(name, send_obj)
   end
   
   # trap_receive
   def trap_receive(notice_name, options = {})
-    logger.debug "trap_receive_data:#{notice_name}:#{Time.now_to_s}"
+    logger.debug "trap_receive_data:#{notice_name}:"
     timeout = options[:timeout] || ReceiveTrapTimeoutSec
     trap_proc = options[:proc] || nil
     trap_loop = options[:loop] || nil # procがある場合のみ有効なフラグ
@@ -180,12 +180,12 @@ class TestClient < DangoClientFramework
           # タイムアウトチェック
           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}):\nnotice_name=#{notice_name} \n#{Time.now_to_s}") 
+              raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}: \n client_name=#{@client_name}(#{self.sid}): \n notice_name=#{notice_name}") 
             end
             
             # 戻ってきたデータがあれば
             if send_receive_shared[notice_name]
-              logger.debug "notice_name:#{notice_name}:#{send_receive_shared[notice_name].inspect} #{Time.now_to_s}"
+              logger.debug "notice_name:#{notice_name}:#{send_receive_shared[notice_name].inspect} "
               break 
             end
             
@@ -199,7 +199,7 @@ class TestClient < DangoClientFramework
           
           # :procが設定されている場合は、それを呼び出す
           if trap_proc
-            logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect} #{Time.now_to_s}"
+            logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect} "
             trap_proc.call(send_receive_shared[notice_name])
             send_receive_shared[notice_name] = nil
             break if ! trap_loop # loopする必要がなければスレッド終了
@@ -207,7 +207,7 @@ class TestClient < DangoClientFramework
           # :procが設定されていなければ、wait用に@receive_arrに入れておく
           else
             @receive_mutex.synchronize do
-              logger.debug "notice_name:#{notice_name}:#{send_receive_shared[notice_name].inspect} #{Time.now_to_s}"
+              logger.debug "notice_name:#{notice_name}:#{send_receive_shared[notice_name].inspect} "
               @receive_arr.push([notice_name.deep_dup, send_receive_shared[notice_name].deep_dup])
               send_receive_shared[notice_name] = nil
             end
@@ -228,22 +228,22 @@ class TestClient < DangoClientFramework
       @trap_thread_hash[notice_name] = th
     else
       
-      logger.debug "trap_receive_data:already register trap:notice_name:#{notice_name} #{Time.now_to_s}"
+      logger.debug "trap_receive_data:already register trap:notice_name:#{notice_name} "
     end
     
   end
   
   # cancel trap_receive
   def cancel_trap_receive(notice_name, options = {})
-    logger.debug "cancel_trap_receive:#{notice_name}:#{Time.now_to_s}"
+    logger.debug "cancel_trap_receive:#{notice_name}:"
     
     # trapスレッドの削除
     if @trap_thread_hash[notice_name] 
-      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:#{Time.now_to_s}"
+      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:"
       @trap_thread_hash[notice_name].kill
-      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:#{Time.now_to_s}"
+      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:"
       @trap_thread_hash[notice_name].join
-      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:#{Time.now_to_s}"
+      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:"
       
       @trap_thread_hash.delete(notice_name)
     end
@@ -258,7 +258,7 @@ class TestClient < DangoClientFramework
   
   # wait_receive
   def wait_receive(notice_name, options = {})
-    logger.debug "wait_receive_data:#{notice_name}:#{Time.now_to_s}"
+    logger.debug "wait_receive_data:#{notice_name}:"
     timeout = options[:timeout] || ReceiveWaitTimeoutSec
     
     # データ受信待ち
@@ -279,7 +279,7 @@ class TestClient < DangoClientFramework
     
     # タイムアウトなら
     if receive_data == nil
-      raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}:\nclient_name=#{@client_name}(#{self.sid})\:notice_name=#{notice_name} \n#{Time.now_to_s}") 
+      raise(DangoFrameworkTimeoutError, "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 = 0
-    TINY  = 32
+    TINY  = 34
 
     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.32
-date: 2007-11-12 00:00:00 +09:00
+  version: 0.0.34
+date: 2007-11-13 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib