dango 0.3.3 → 0.3.4

data/lib/dango/client_framework.rb

@@ -42,9 +42,11 @@ class DangoClientFramework
     @connection_client_host = @config['network']['host'] || 'localhost'
     @connection_client_port = @config['network']['port'] || 15000
     
-    @connection_client_log_file = ""              # 未定義時にこのログファイル名を使う
-#    @connection_client_log_level = Logger::DEBUG  # 未定義時にこのログレベルになる
-    @connection_client_log_level = Logger::INFO   # 未定義時にこのログレベルになる
+    @connection_client_log_file       =    ""              # 未定義時にこのログファイル名を使う
+#    @connection_client_log_level      = Logger::DEBUG  # 未定義時にこのログレベルになる
+    @connection_client_log_level      = Logger::INFO   # 未定義時にこのログレベルになる
+    @connection_client_log_max_size   = 1048576   # 未定義時にこのログレベルになる
+    @connection_client_log_shift_age  = 99   # 未定義時にこのログレベルになる
     
     @connection_encode_type = EncodeTypeMarshal
     
@@ -65,10 +67,10 @@ class DangoClientFramework
       raise DangoError, message
     end
     
-    @log_file = @connection_client_log_file
-    @log_level = @connection_client_log_level
-    @log_max_size = 1048576
-    @log_shift_age = 99
+    @log_file      = @connection_client_log_file
+    @log_level     = @connection_client_log_level
+    @log_max_size  = @connection_client_log_max_size
+    @log_shift_age = @connection_client_log_shift_age
     
     # loggerの準備
     logger.debug("-------client initialize host=#{@connection_client_host} port=#{@connection_client_port}")

data/lib/dango/framework_base.rb

@@ -16,7 +16,8 @@ require "kconv"
 require "fcntl"
 
 require "rubygems"
-require "json"
+require 'json/add/rails'
+
 
 require "dango/shared/memory_store.rb"
 
@@ -234,6 +235,7 @@ module DangoFrameworkModule
   def dango_send_data(sock, send_objs, options = {})
     encode_type = options[:encode_type] || DefaultEncodeType
 #    logger.debug "dango_send_data:sock=#{sock.inspect} encode_type=#{encode_type}"
+#    logger.debug "dango_send_data:send_objs=#{send_objs.inspect}"
     
     if send_objs == []
       send_data_orig = ""

data/lib/dango/server_framework.rb

@@ -699,7 +699,12 @@ EOF
               # クライアントから来たハートビートの時間チェックし、古ければsocketを閉じる
               if heart_beat_time_hash[sid] && heart_beat_time_hash[sid] < Time.now - @heart_beat_receive_wait_sec
                 logger.warn "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{sock}:#{sock.closed?}"
-                sock.close if !sock.closed?
+#                sock.close if !sock.closed?
+                begin
+                  sock.close
+                rescue
+                  logger.warn "heart_beat_thread_start:failed close socket:#{error_message($!, 'u')}"
+                end
               end
             end
           end
@@ -819,7 +824,7 @@ EOF
           
           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: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]) # データ送信

data/lib/dango/tester/dango_tester_client.rb

@@ -190,8 +190,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_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
   end
   
   # テストサーバー

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     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.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-20 00:00:00 +09:00
+date: 2008-07-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency