dango 0.5.1 → 0.5.2

data/lib/dango/dango_g_server.rb

@@ -193,7 +193,8 @@ class GServer
     raise "running" if !stopped?
     @shutdown = false
     @maxConnections = maxConnections if maxConnections > 0
-    @@servicesMutex.synchronize  {
+#    @@servicesMutex.synchronize  {
+    @@servicesMutex.timeout_sync(10, :tcp_server_start)  {
       if GServer.in_service?(@port,@host)
         raise "Port already in use: #{host}:#{@port}!"
       end

data/lib/dango/dango_mutex.rb

@@ -21,6 +21,8 @@ class DangoMutex < Mutex
   def timeout_sync(sec = 10, lock_name = "")
     ret = nil
     begin
+      before_time = Time.now
+      
       timeout(sec, DangoFrameworkMutexTimeoutException) do
         self.synchronize do
           @lock_name = lock_name
@@ -47,6 +49,7 @@ class DangoMutex < Mutex
       error_msg += "DangoFrameworkMutexTimeoutException " + 
                    "self=#{self.mutex_name}(#{lock_name})\n" + 
                    "locked_mutex=#{locked_msg}\n" + 
+                   "before_time=#{before_time.to_ss}\n" + 
                    "#{$!.message}\n" + 
                    "#{$!.backtrace.pretty_inspect}"
       

data/lib/dango/error_message.rb

@@ -17,8 +17,13 @@ module ErrorMessage
     end
     
     str = "class=#{exception_class.class}\n" + 
-          "message=#{exception_class.message}\n" + 
-          "backtrace=#{exception_class.backtrace.pretty_inspect}"
+          "message=#{exception_class.message}\n"
+    begin
+      str += "backtrace=#{exception_class.backtrace.pretty_inspect}"
+    rescue Exception
+      str += "backtrace=#{exception_class.backtrace.inspect}"
+    end
+    
     if code.to_s.downcase == "u" || code.to_s.downcase == "utf8"
       str = str.toutf8
     elsif code.to_s.downcase == "s" || code.to_s.downcase == "sjis"

data/lib/dango/monitor/server_monitor_module.rb

@@ -15,14 +15,14 @@ module ServerMonitorModule
       'server_up_time'    => Time.now - @start_time,
       'server_version'    => "#{Dango::VERSION::STRING} p#{Dango::VERSION::PATCH}(r#{RAILS_GEM_VERSION})",
       
-      'recv_count'        => @recv_count, # 受信回数
-      'send_count'        => @send_count, # 送信回数
-      'recv_fail_count'   => @recv_fail_count, # 受信失敗回数
-      'send_fail_count'   => @send_fail_count, # 送信失敗回数
-      'recv_byte'         => @recv_byte, # 受信バイト数
-      'send_byte'         => @send_byte, # 送信バイト数
+      'recv_count'        => @recv_count.to_i, # 受信回数
+      'send_count'        => @send_count.to_i, # 送信回数
+      'recv_fail_count'   => @recv_fail_count.to_i, # 受信失敗回数
+      'send_fail_count'   => @send_fail_count.to_i, # 送信失敗回数
+      'recv_byte'         => @recv_byte.to_i, # 受信バイト数
+      'send_byte'         => @send_byte.to_i, # 送信バイト数
       
-      'mutex_fail_count'  => @mutex_fail_count, # 送信失敗回数
+      'mutex_fail_count'  => @mutex_fail_count.to_i, # 送信失敗回数
       
 #      'log_level'     => log_level_str,
 #      'log_file'      => log_file,

data/lib/dango/server_framework.rb

@@ -96,14 +96,22 @@ class DangoServerFramework
     
     # SIGINT の捕捉
     Signal.trap(:INT) do 
-      logger.warn "SIGINT\n#{caller(0).pretty_inspect}"
+      begin
+        logger.warn "SIGINT\n#{caller(0).pretty_inspect}"
+      rescue Exception
+        logger.warn "SIGINT\n#{caller(0).inspect}"
+      end
       stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
     
     # 終了処理を登録しておく(これが無いとWindowsではエラーが出てもプロセスが落ちないことがある)
     at_exit do
-      logger.info "at_exit ERROR\n#{caller(0).pretty_inspect}"
+      begin
+        logger.info "at_exit ERROR\n#{caller(0).pretty_inspect}"
+      rescue Exception
+        logger.info "at_exit ERROR\n#{caller(0).inspect}"
+      end
       stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
@@ -428,9 +436,11 @@ class DangoServerFramework
                 
               end # @mutex_proc_thread
             rescue DangoFrameworkMutexTimeoutException
-              @mutex_fail_count += 1
+              @mutex_fail_count += 1 if @mutex_fail_count
               @action_stat[action_name][:fail_count] += 1
               logger.warn "receive_action DangoFrameworkMutexTimeoutException. #{sid} \n#{error_message($!, 'u')}"
+              sleep 1
+              logger.warn "receive_action DangoFrameworkMutexTimeoutException. #{sid} end sleep"
               raise(DangoFrameworkDisconnectException)
             rescue Exception
               logger.error "receive_action Exception #{sid} #{error_message($!, 'u')}"
@@ -458,11 +468,13 @@ class DangoServerFramework
                 
               end # mutex_proc_thread
             rescue DangoFrameworkMutexTimeoutException
-              @mutex_fail_count += 1
-              logger.warn "receive_action DangoFrameworkMutexTimeoutException. #{sid} \n#{error_message($!, 'u')}"
+              @mutex_fail_count += 1 if @mutex_fail_count
+              logger.warn "dango_connect DangoFrameworkMutexTimeoutException. #{sid} \n#{error_message($!, 'u')}"
+              sleep 1
+              logger.warn "dango_connect DangoFrameworkMutexTimeoutException. #{sid} end sleep"
               raise(DangoFrameworkDisconnectException)
             rescue Exception
-              logger.error "receive_action Exception #{sid} #{error_message($!, 'u')}"
+              logger.error "dango_connect Exception #{sid} #{error_message($!, 'u')}"
               raise(DangoFrameworkDisconnectException)
             end
           end
@@ -496,8 +508,10 @@ class DangoServerFramework
       logger.debug "#{$!.class}. #{sid} maybe dissconnect exception \n#{error_message($!, 'u')}"
       
     rescue DangoFrameworkMutexTimeoutException
-      @mutex_fail_count += 1
+      @mutex_fail_count += 1 if @mutex_fail_count
       logger.warn "DangoFrameworkMutexTimeoutException. #{sid} \n#{error_message($!, 'u')}"
+      sleep 1
+      logger.warn "DangoFrameworkMutexTimeoutException. #{sid} end sleep"
       
     rescue DangoFrameworkException
       logger.debug "DangoFrameworkException. #{sid} \n#{error_message($!, 'u')}"
@@ -532,9 +546,9 @@ class DangoServerFramework
                 
               rescue DangoFrameworkMutexTimeoutException
                 need_retry = true
-                @mutex_fail_count += 1
-                logger.warn "dango_close DangoFrameworkMutexTimeoutException " + 
-                             "#{sock.object_id} #{sid} \n#{error_message($!, 'u')}"
+                @mutex_fail_count += 1 if @mutex_fail_count
+                logger.warn "dango_close DangoFrameworkMutexTimeoutException1#{sid} \n " + 
+                             "#{error_message($!, 'u')}"
               end
               
               if need_retry # リトライが必要と判断されれば
@@ -544,8 +558,17 @@ class DangoServerFramework
                 break
               end
             end # times
+            
           rescue Exception
-            logger.error "dango_close #{sock.object_id} #{sid} ERROR\n#{error_message($!, 'u')}"
+            if $!.class == DangoFrameworkMutexTimeoutException
+              @mutex_fail_count += 1 if @mutex_fail_count
+              logger.warn "dango_close DangoFrameworkMutexTimeoutException2 #{sid} \n" + 
+                           "#{error_message($!, 'u')}"
+              sleep 1
+              logger.warn "dango_close DangoFrameworkMutexTimeoutException. #{sid} end sleep"
+            else
+              logger.error "dango_close #{sock.object_id} #{sid} ERROR\n#{error_message($!, 'u')}"
+            end
           end
         end
       end
@@ -557,11 +580,13 @@ class DangoServerFramework
       rescue IOError
         logger.info "IOError #{sock.object_id} #{sid}"
       rescue DangoFrameworkMutexTimeoutException
-        @mutex_fail_count += 1
-        logger.warn "DangoFrameworkMutexTimeoutException #{sock.object_id} #{sid}\n" + 
+        @mutex_fail_count += 1 if @mutex_fail_count
+        logger.warn "sock.close DangoFrameworkMutexTimeoutException #{sid} #{sock.object_id}\n" + 
                     "#{error_message($!, 'u')}"
+        sleep 1
+        logger.warn "sock.close DangoFrameworkMutexTimeoutException. #{sid} end sleep"
       rescue Exception
-        logger.error "#{sock.object_id} #{sid} Exception\n#{error_message($!, 'u')}"
+        logger.error "sock.close Exception #{sid} #{sock.object_id}\n#{error_message($!, 'u')}"
       end
       
       logger.info "#{sock.object_id} #{sid} is closed"
@@ -574,9 +599,11 @@ class DangoServerFramework
           sock = nil   # ソケット削除
         end
       rescue DangoFrameworkMutexTimeoutException
-        @mutex_fail_count += 1
-        logger.warn "DangoFrameworkMutexTimeoutException #{sock.object_id} #{sid}\n" + 
+        @mutex_fail_count += 1 if @mutex_fail_count
+        logger.warn "sock = nil DangoFrameworkMutexTimeoutException #{sid} #{sock.object_id}\n" + 
                     "#{error_message($!, 'u')}"
+        sleep 1
+        logger.warn "sock = nil DangoFrameworkMutexTimeoutException. #{sid} end sleep"
       end
       
       @mutex_sock.delete(sock_object_id) # ソケット排他処理から削除
@@ -584,7 +611,8 @@ class DangoServerFramework
       @session_manager.close_session(sid) # sessionの終了処理
       
     rescue Exception
-      logger.error "close process failed:#{sock.object_id} #{sid} Exception\n#{error_message($!, 'u')}"
+      logger.error "close process failed:Exception #{sid} #{sock.object_id} \n" + 
+                   "#{error_message($!, 'u')}"
     end
     
   end
@@ -786,7 +814,7 @@ EOF
           output_memory_statistics() if @statistics_process_memory # メモリ使用量統計
           
         rescue DangoFrameworkMutexTimeoutException
-          @mutex_fail_count += 1
+          @mutex_fail_count += 1 if @mutex_fail_count
           logger.warn "DangoFrameworkMutexTimeoutException gc_thread_start" + 
                        "#{error_message($!, 'u')}"
         rescue Exception
@@ -830,7 +858,11 @@ EOF
         begin
           sleep @herat_beat_interval_sec
           
-          next if @gserver.stopped? # gserverが起動していればスキップ
+          # gserverが初期化されていなければスキップ
+          # gserverが起動していればスキップ
+          next if ! @gserver 
+          next if ! @gserver.respond_to?(:stopped?)
+          next if @gserver.stopped?
           
 #          logger.debug "mpth:1:heart_beat_thread_start "
 #          @mutex_proc_thread.timeout_sync(3, :heart_beat_thread) do
@@ -889,7 +921,7 @@ EOF
           logger.debug "heart_beat_thread_start end"
           
         rescue DangoFrameworkMutexTimeoutException
-          @mutex_fail_count += 1
+          @mutex_fail_count += 1 if @mutex_fail_count
           logger.warn "DangoFrameworkMutexTimeoutException heart_beat_thread_start" + 
                        "#{error_message($!, 'u')}"
         rescue Exception
@@ -938,7 +970,7 @@ EOF
           @queue_send_notice.push([sid, send_obj_dup, encode_type].deep_dup)
         end
       rescue DangoFrameworkMutexTimeoutException
-        @mutex_fail_count += 1
+        @mutex_fail_count += 1 if @mutex_fail_count
         logger.warn "mutex_send_notice #{error_message($!, 'u')}"
       rescue Exception
         logger.error "mutex_send_notice #{error_message($!, 'u')}"
@@ -1006,7 +1038,7 @@ EOF
             logger.info "thread_send_notice_queue:failed send. sid=#{sid} " + 
                         "sock=#{sock.object_id} #{$!.class}"
           rescue DangoFrameworkMutexTimeoutException
-            @mutex_fail_count += 1
+            @mutex_fail_count += 1 if @mutex_fail_count
             logger.warn "thread_send_notice_queue:failed send. sid=#{sid} " + 
                         "sock=#{sock.object_id} #{$!.class}"
           rescue Exception
@@ -1023,7 +1055,7 @@ EOF
         sleep @send_receive_sleep_interval_sec # スリープ
         
       rescue DangoFrameworkMutexTimeoutException
-        @mutex_fail_count += 1
+        @mutex_fail_count += 1 if @mutex_fail_count
         logger.warn "ERROR:thread_send_notice_queue:DangoFrameworkMutexTimeoutException" + 
                     "#{error_message($!, 'u')}"
       rescue Exception
@@ -1073,24 +1105,26 @@ EOF
           begin
             before_time = Time.now
             
-            logger.debug "mpth:1:sls start"
+            logger.debug "mpth:1:sls"
             @mutex_proc_thread.timeout_sync(3, "set_loop_setting_send_#{method_name}") do
+              logger.debug "mpth:2:sls"
               __send__(method_name)
             end # mutex_proc_thread
-            logger.debug "mpth:2:sls end"
             # if count % 1000 == 0
             
-            real_wait_sec = wait_sec - (Time.now - before_time)
-            logger.debug "set_loop_setting:compute time=#{real_wait_sec - wait_sec}" if real_wait_sec < 0
+            exec_sec = Time.now - before_time
+            logger.info "set_loop_setting:long execute time=#{exec_sec}" if exec_sec > 1.0
+            
+            real_wait_sec = wait_sec - exec_sec
             sleep real_wait_sec if real_wait_sec > 0
             
             count += 1
             count = 0 if count >= 10000000
             
             # mutex_fail_countが増えたらサーバーが重くなりすぎていると判断してちょっと待つ
-            if @mutex_fail_count > last_mutex_fail_count
+            if @mutex_fail_count.to_i > last_mutex_fail_count
               sleep 1
-              last_mutex_fail_count = @mutex_fail_count.deep_dup
+              last_mutex_fail_count = @mutex_fail_count.to_i
             end
             
             # メンテナンス機能
@@ -1099,7 +1133,7 @@ EOF
               sleep 10000 
             end
           rescue DangoFrameworkMutexTimeoutException
-            @mutex_fail_count += 1
+            @mutex_fail_count += 1 if @mutex_fail_count
             logger.warn "set_loop_setting error:#{error_message($!, 'u')}"
           rescue Exception
             logger.error "set_loop_setting error:#{error_message($!, 'u')}"

data/lib/dango/tasks/dango_rake.rb

@@ -321,6 +321,7 @@ namespace :dango do
   task :stop_dango_process do
     dru = DangoRakeUtil.new
     dru.check_verbose_mode() # verboseモードのフラグを立てる処理
+    dru.puts_noverbose "stop_dango_process env=#{ENV['RAILS_ENV']}"
     
     pid = dru.get_dango_pid()
     dru.stop_process(pid) if pid # pidがあればプロセス停止
@@ -331,7 +332,7 @@ namespace :dango do
   task :check_dango_process do
     dru = DangoRakeUtil.new
     dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-    dru.puts_noverbose "check_dango_process"
+    dru.puts_noverbose "check_dango_process env=#{ENV['RAILS_ENV']}"
     
     # サーバーを再起動するかどうかの判定
     pid = dru.get_dango_pid()                                    # pidのチェック
@@ -359,7 +360,7 @@ namespace :dango do
       socket_list = dru.drb_call(:_monitor_get_socket_list)
       
       dru.puts_noverbose "server_up_time=#{server_info['server_up_time'].inspect} " + 
-                         "socket_list.size=#{socket_list.size}"
+                         "socket_list.size=#{socket_list.size} long_alive_minutes=#{long_alive_minutes}"
       
       # サーバーが長く起動していて、接続者がいないのなら
       if check_dango_process_cmd && 
@@ -422,7 +423,7 @@ namespace :dango do
   task :get_trouble_status do
     dru = DangoRakeUtil.new
     dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-    dru.puts_noverbose "get_trouble_status"
+    dru.puts_noverbose "get_trouble_status env=#{ENV['RAILS_ENV']}"
     
     config = YAML.load(open("#{RAILS_ROOT}/config/dango/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
     pid = dru.get_dango_pid()                                    # pidのチェック
@@ -435,7 +436,7 @@ namespace :dango do
     task :get_server_info do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "get_server_info"
+      dru.puts_noverbose "get_server_info env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_get_server_info)
     end
     
@@ -443,7 +444,7 @@ namespace :dango do
     task :thread_status do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "thread_status"
+      dru.puts_noverbose "thread_status env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_thread_status)
     end
     
@@ -451,7 +452,7 @@ namespace :dango do
     task :mutex_status do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "mutex_status"
+      dru.puts_noverbose "mutex_status env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_mutex_status)
     end
     
@@ -459,7 +460,7 @@ namespace :dango do
     task :get_shared do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "get_shared"
+      dru.puts_noverbose "get_shared env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_get_shared)
     end
     
@@ -467,7 +468,7 @@ namespace :dango do
     task :write_shared do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "write_shared"
+      dru.puts_noverbose "write_shared env=#{ENV['RAILS_ENV']}"
       key   = ENV["KEY"]
       value = ENV["VALUE"]
       if ! key || ! value
@@ -481,7 +482,7 @@ namespace :dango do
     task :get_socket_list do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "get_socket_list"
+      dru.puts_noverbose "get_socket_list env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_get_socket_list)
     end
     
@@ -489,7 +490,7 @@ namespace :dango do
     task :get_session_list do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "get_session_list"
+      dru.puts_noverbose "get_session_list env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_get_session_list)
     end
     
@@ -497,7 +498,7 @@ namespace :dango do
     task :get_action_stat do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "get_action_stat"
+      dru.puts_noverbose "get_action_stat env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_get_action_stat)
     end
     
@@ -505,7 +506,7 @@ namespace :dango do
     task :server_reload do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "server_reload"
+      dru.puts_noverbose "server_reload env=#{ENV['RAILS_ENV']}"
       pp dru.drb_call(:_monitor_server_reload)
     end
     
@@ -513,7 +514,7 @@ namespace :dango do
     task :send_system_message do
       dru = DangoRakeUtil.new
       dru.check_verbose_mode() # verboseモードのフラグを立てる処理
-      dru.puts_noverbose "send_system_message"
+      dru.puts_noverbose "send_system_message env=#{ENV['RAILS_ENV']}"
       
       message_type = ENV["TYPE"]
       if ! message_type

data/lib/dango/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-01 00:00:00 +09:00
+date: 2008-12-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dango
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Realtime communications network framework for Ruby and Flash on Rails.