dango 0.0.26 → 0.0.29

data/lib/dango/client_framework.rb

@@ -40,8 +40,6 @@ class DangoClientFramework
     @connection_client_host = @config['network']['host'] || 'localhost'
     @connection_client_port = @config['network']['port'] || 15000
     
-    @connection_client_host = 'localhost'         # 未定義時にこのホスト名でサーバー開始
-    @connection_client_port = 15000               # 未定義時にこのポートでサーバー開始
     @connection_client_log_file = ""              # 未定義時にこのログファイル名を使う
     @connection_client_log_level = Logger::DEBUG  # 未定義時にこのログレベルになる
     

data/lib/dango/server_framework.rb

@@ -27,6 +27,7 @@ class DangoServerFramework
   SendTimeoutSec = 10.0               # データ送受信時の送信のタイムアウト秒数
   HeartBeatIntervalSec = 60.0         # S=>Cのheart beatの送信間隔秒数
   HeartBeatResponseWaitSec = 20.0     # S=>Cのheart beatの返信待ち秒数
+  GCIntervalSec = 5.0                 # GCの発生タイミング
   
   
   class DangoGServer < GServer
@@ -96,8 +97,9 @@ class DangoServerFramework
     socket_list_init()                    # ソケット一覧を初期化
     mutex_socket_list_init()              # ソケット毎用のmutexを初期化
     @mutex_proc_thread = Mutex.new        # スレッドが同時起動しないようにするためのMutex
-    dango_server_init()                      # 初期設定読み込み
+    dango_server_init()                   # 初期設定読み込み
     heart_beat_thread_start()             # ハートビートスレッドの開始
+    gc_thread_start()                     # GCスレッドの開始
     
     @mutex_send_response = Mutex.new      # 送信レスポンス用のMutex
     @arr_send_response = []               # 送信レスポンス用のキャッシュ
@@ -107,6 +109,10 @@ class DangoServerFramework
                                 @connection_server_max_connections)
     @gserver.audit = true                 # Turn logging on.
     
+    GC.enable
+    GC.start 
+    GC.disable
+    
     begin
       @gserver.start
     rescue Exception
@@ -146,7 +152,9 @@ class DangoServerFramework
         puts "-- stopped server"
         
         # GCを行う
-        GC.start
+        GC.enable
+        GC.start 
+        GC.disable
         
         # サーバーファイルを読み直し
         puts "-- reload classes"
@@ -349,6 +357,7 @@ class DangoServerFramework
     @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
+    @gc_interval_sec                   = @config['server']['gc_interval_sec'] || GCIntervalSec
     
     
     log_level_hash = {
@@ -559,6 +568,26 @@ class DangoServerFramework
     end
   end
   
+  # GCスレッドの開始
+  def gc_thread_start
+    Thread.start do
+      loop do
+        begin
+          sleep @gc_interval_sec
+          
+          gc_start_time = Time.now
+          GC.enable
+          GC.start 
+          GC.disable
+          logger.debug "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}"
+          
+        rescue
+          logger.error "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
+        end
+      end
+    end
+  end
+  
   # サーバーからクライアントへのデータ送信
   def send_notice(sid, notice_name, send_obj, options = {})
     logger.debug "send_notice(#{sid.inspect}, #{notice_name.inspect}) #{Time.now_to_s}"

data/lib/dango/tasks/dango_rake.rb

@@ -73,12 +73,13 @@ namespace :dango do
         dm = DangoMonitorClient.new()
         p dm.server_reload()
         dm.dango_client_close
+        puts "complete server_reload."
       rescue
         p $!.class
         p $!.message
         p $!.backtrace
+        puts "failed server_reload."
       end
-      puts "complete server_reload."
     end
     
     desc "send_system_message" # システムメッセージ配信
@@ -100,12 +101,13 @@ namespace :dango do
         dm = DangoMonitorClient.new()
         p dm.send_system_message(message)
         dm.dango_client_close
+        puts "complete send_system_message."
       rescue
         p $!.class
         p $!.message
         p $!.backtrace
+        puts "failed send_system_message."
       end
-      puts "complete send_system_message."
     end
     
   end

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 26
+    TINY  = 29
 
     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.26
-date: 2007-11-03 00:00:00 +09:00
+  version: 0.0.29
+date: 2007-11-07 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib
@@ -78,3 +78,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: