dango 0.0.36 → 0.0.37

data/LICENSE

@@ -0,0 +1,16 @@
+Copyright (C) 2007 Keisuke Minami
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+

data/Manifest.txt

@@ -1,6 +1,6 @@
 Manifest.txt
 README.txt
-MIT-LICENSE
+LICENSE
 lib/dango/client_framework.rb
 lib/dango/framework_base.rb
 lib/dango/server_framework.rb

data/lib/dango/framework_base.rb

@@ -162,7 +162,7 @@ module DangoFrameworkModule
     if size_str == "<polic"
       logger.debug "size_str=#{size_str.inspect}"
       receive_data = sock.recv(18)
-      logger.debug "dango_receive_data:receive_data=#{receive_data}"
+      logger.info "flash policy file: dango_receive_data:receive_data=#{receive_data}"
       raise(DangoFrameworkFlashPolicyError) 
     end
     

data/lib/dango/monitor/dango_monitor_client.rb

@@ -10,9 +10,8 @@
 
 require 'dango/client_framework' # コネクションサーバーフレームワークの呼び出し
 
-# 
 
-# メインクラス
+# モニター用のdangoクライアントクラス
 class DangoMonitorClient < DangoClientFramework
   ConnTimeout = 6
   
@@ -35,22 +34,42 @@ class DangoMonitorClient < DangoClientFramework
   # 読み込みのみ
   attr_reader(:is_session_closed) 
   
-  # サーバーの全情報取得
-  def get_all_info
-    logger.debug "DangoMonitorClient:get_all_info:#{ENV['RAILS_ROOT']}"
+  # 情報取得系の処理を整理したもの
+  def get_server_info_common(monitor_action_name)
+    logger.debug "DangoMonitorClient:#{monitor_action_name}:#{ENV['RAILS_ROOT']}"
     begin
-      ret_obj = send_action_return_notice('_monitor_all_info', {})
+      ret_obj = send_action_return_notice("_monitor_#{monitor_action_name}", {})
       raise("code is not 0 (faild). :code=#{ret_obj['code']}") if ret_obj['code'] != 0
-      return(ret_obj['all_info'])
+      return(ret_obj[monitor_action_name])
     rescue DangoFrameworkConnectionError
-      raise("monitor_all_info Connection error")
+      raise("#{monitor_action_name} Connection error")
     rescue DangoFrameworkTimeoutError
-      raise("monitor_all_info Timeout error")
+      raise("#{monitor_action_name} Timeout error")
     ensure
       dango_client_close
     end
   end
   
+  # サーバーの情報取得
+  def get_server_info
+    get_server_info_common("get_server_info")
+  end
+  
+  # sharedの情報取得
+  def get_shared
+    get_server_info_common("get_shared")
+  end
+  
+  # session_listの情報取得
+  def get_session_list
+    get_server_info_common("get_session_list")
+  end
+  
+  # socket_listの情報取得
+  def get_socket_list
+    get_server_info_common("get_socket_list")
+  end
+  
   # サーバーのデータリロード
   def server_reload
     logger.debug "DangoMonitorClient:server_reload"

data/lib/dango/monitor/server_monitor_action.rb

@@ -26,8 +26,17 @@ class ServerMonitorAction
     if action_name == '_monitor_all_info' # メンテナンスアクション名なら
       dango_server_monitor_all_info(ret_obj)
       
-    elsif action_name == '_monitor_server_reload' # メンテナンスアクション名なら
-      dango_server_monitor_server_reload(ret_obj)
+    elsif action_name == '_monitor_get_server_info' # メンテナンスアクション名なら
+      dango_server_monitor_get_server_info(ret_obj)
+      
+    elsif action_name == '_monitor_get_shared' # メンテナンスアクション名なら
+      dango_server_monitor_get_shared(ret_obj)
+      
+    elsif action_name == '_monitor_get_session_list' # メンテナンスアクション名なら
+      dango_server_monitor_get_session_list(ret_obj)
+      
+    elsif action_name == '_monitor_get_socket_list' # メンテナンスアクション名なら
+      dango_server_monitor_get_socket_list(ret_obj)
       
     elsif action_name == '_monitor_send_system_message' # メンテナンスアクション名なら
       dango_server_monitor_send_system_message(ret_obj)
@@ -68,13 +77,9 @@ class ServerMonitorAction
   end
   
   # メンテナンスコマンド：サーバーからクライアントへのデータ送信
-  def dango_server_monitor_all_info(ret_obj)
-    logger.debug "dango_server_monitor_all_info:#{ret_obj.inspect}"
-    all_info = {
-      'shareds'       => shared.to_hash,
-      'socket_list'   => socket_list.keys,
-      'session_list'  => session_list,
-      
+  def dango_server_monitor_get_server_info(ret_obj)
+    logger.debug "dango_server_monitor_get_server_info:#{ret_obj.inspect}"
+    get_server_info = {
       'server_start_time' => @parent.start_time.strftime("%Y-%m-%d %H:%M:%S"),
       'up_time'           => Time.now - @parent.start_time,
       
@@ -87,12 +92,31 @@ class ServerMonitorAction
       'log_file'      => @parent.log_file,
       'log_max_size'  => @parent.log_max_size,
       'log_shift_age' => @parent.log_shift_age,
-      
-#      'dummy' => "dummy "*1000, # ダミー情報
     }
     
-    send_obj = {'code'=>0, 'all_info'=>all_info}
-    @parent.send_notice(session[:sid], 'return__monitor_all_info', send_obj, :type=>2)
+    send_obj = {'code'=>0, 'get_server_info'=>get_server_info}
+    @parent.send_notice(session[:sid], 'return__monitor_get_server_info', send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_server_monitor_get_shared(ret_obj)
+    logger.debug "dango_server_monitor_get_shared:#{ret_obj.inspect}"
+    send_obj = {'code'=>0, 'get_shared'=>shared.to_hash}
+    @parent.send_notice(session[:sid], 'return__monitor_get_shared', send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_server_monitor_get_session_list(ret_obj)
+    logger.debug "dango_server_monitor_get_session_list:#{ret_obj.inspect}"
+    send_obj = {'code'=>0, 'get_session_list'=>session_list}
+    @parent.send_notice(session[:sid], 'return__monitor_get_session_list', send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_server_monitor_get_socket_list(ret_obj)
+    logger.debug "dango_server_monitor_get_socket_list:#{ret_obj.inspect}"
+    send_obj = {'code'=>0, 'get_socket_list'=>socket_list.keys}
+    @parent.send_notice(session[:sid], 'return__monitor_get_socket_list', send_obj, :type=>2)
   end
   
   # メンテナンスコマンド：サーバーデータ再読み込み

data/lib/dango/server_framework.rb

@@ -36,6 +36,7 @@ class DangoServerFramework
   HeartBeatReceiveWaitSec = 30.0      # C=>Sのheart beatの受信待ち秒数
   GCIntervalSec = 5.0                 # GCの発生タイミング
   
+  ServerStopWait = 0.2                # サーバー停止時のGServerの確認待ち時間
   
   class DangoGServer < GServer
     def initialize(parent, *args)
@@ -56,14 +57,37 @@ class DangoServerFramework
     end
     
     def starting()
+      log("#{self.class.to_s} #{@host}:#{@port} start")
       @parent.starting()
     end
     
     def stopping()
+      log("#{self.class.to_s} #{@host}:#{@port} stop")
       @parent.stopping()
     end
   end
   
+  def exit_process() # プロセス終了処理
+    # サーバーを停止
+    if @gserver && !@gserver.stopped?
+      @gserver.shutdown
+      @gserver.stop
+#      while(!@gserver.stopped?) do
+#        sleep ServerStopWait
+#        debug_print("waiting... #{@gserver.stopped?} #{@gserver.connections}")
+#      end
+      10.times do
+        break if @gserver.stopped?
+        sleep ServerStopWait
+        debug_print("waiting... #{@gserver.stopped?} #{@gserver.connections}")
+      end
+    end
+    
+    debug_print("shutdown")
+    puts "shutdown"
+    exit!
+  end
+  
   def initialize(config)
     @config           = config # 設定ファイル
     
@@ -72,18 +96,12 @@ class DangoServerFramework
     
     # SIGINT の捕捉
     Signal.trap(:INT) do 
-      # サーバーを停止
-      if @gserver && !@gserver.stopped?
-        @gserver.shutdown
-        @gserver.stop
-        while(!@gserver.stopped?) do
-          sleep 1
-          debug_print("waiting... #{@gserver.stopped?} #{@gserver.connections}")
-        end
-      end
-      
-      puts "shutdown"
-      exit!
+      exit_process() # プロセス終了処理
+    end
+    
+    # 終了処理を登録しておく(これが無いとWindowsではエラーが出てもプロセスが落ちないことがある)
+    at_exit do
+      exit_process() # プロセス終了処理
     end
     
     # サーバー開始
@@ -107,11 +125,11 @@ class DangoServerFramework
   def server_start()
     set_server_variables()                # 各種サーバー仕様の変数設定
     
-    logger.info("===== server initialize =====") # loggerの準備
-    logger.info("Process.pid=#{Process.pid}")
-    logger.info("port=#{@server_port}")
-    logger.info("host=#{@server_host}")
-    logger.info("max_connections=#{@server_max_connections}")
+    logger.warn("===== server initialize =====") # loggerの準備
+    logger.warn("Process.pid=#{Process.pid}")
+    logger.warn("port=#{@server_port}")
+    logger.warn("host=#{@server_host}")
+    logger.warn("max_connections=#{@server_max_connections}")
     
     open("tmp/pids/dango.pid", "wb"){|fh| fh.write Process.pid.to_s }
     
@@ -171,7 +189,7 @@ class DangoServerFramework
         @gserver.shutdown
         @gserver.stop
         while(!@gserver.stopped?) do
-          sleep 1
+          sleep ServerStopWait
           debug_print("waiting... #{@gserver.stopped?} #{@gserver.connections}")
         end
         
@@ -270,7 +288,7 @@ class DangoServerFramework
       # メインループ入り
       loop do
         if sock.closed?
-          logger.debug "#{sock.inspect}:sock is closed..."
+          logger.info "#{sock.inspect}:sock is closed..."
           break
         end
         
@@ -283,7 +301,7 @@ class DangoServerFramework
         end
         
         if is_flash_policy_file && @policy_file_request # Flashのポリシーファイルが来たら
-          logger.debug "is_flash_policy_file #{sid} "
+          logger.info "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
@@ -296,7 +314,7 @@ class DangoServerFramework
           
         else # 受信データがあれば
           if !(ret_obj && ret_obj["action"]) # actionが無い場合はエラー
-            logger.error "no action error:#{ret_obj.inspect}"
+            logger.warn "no action error:#{ret_obj.inspect}"
             raise(DangoFrameworkError, "no action error") 
           end
           
@@ -313,7 +331,7 @@ class DangoServerFramework
               ServerMonitorAction.new(self, @config, sock, ret_obj)
               
             else # メンテナンスコマンド以外のユーザーアクション名なら
-              logger.debug "receive_action:#{sid}:#{action_name}:"
+              logger.info "receive_action:#{sid}:#{action_name}:"
               begin
                 __send__("dango_receive_#{action_name}", ret_obj)
               rescue NoMethodError
@@ -328,10 +346,10 @@ class DangoServerFramework
       end # loop
       
     rescue DangoFrameworkFlashPolicyError
-      logger.debug "Flash policy file send. #{sid} "
+      logger.info "Flash policy file send. #{sid} "
       
     rescue DangoFrameworkMonitorSecurityError
-      logger.debug "Monitor Security Error #{sid} "
+      logger.warn "Monitor Security Error #{sid} "
       
     rescue DangoFrameworkReadNoDataError
       @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
@@ -351,10 +369,10 @@ class DangoServerFramework
       logger.error "Exception #{sid} #{error_message($!, 'u')}"
       
     ensure
-      logger.info "#{sock.inspect} #{sid} is closing"
       
       @mutex_proc_thread.synchronize do
         begin
+          logger.info "#{sock.inspect} #{sid} is closing"
           dango_close() # 接続解除時に呼び出されるメソッド
         rescue Exception
           logger.error "#{sock.inspect} #{sid} ERROR\n#{error_message($!, 'u')}"
@@ -363,15 +381,15 @@ class DangoServerFramework
           begin
             sock.close if !sock.closed?           # ソケットを閉じる
           rescue IOError
-            logger.debug "IOError #{sock} #{sid}"
+            logger.error "IOError #{sock} #{sid}"
           end
           
           logger.info "#{sock.inspect} #{sid} is closed"
+          
+          session_del()
         end
-        
       end
       
-      session_del()
     end
   end
   
@@ -426,10 +444,10 @@ class DangoServerFramework
     
     
     @start_time = Time.now # サーバー起動時間
-    @recv_count = 0 # 受信回数
-    @send_count = 0 # 送信回数
-    @recv_fail_count = 0 # 受信失敗回数
-    @send_fail_count = 0 # 送信失敗回数
+    @recv_count = 0        # 受信回数
+    @send_count = 0        # 送信回数
+    @recv_fail_count = 0   # 受信失敗回数
+    @send_fail_count = 0   # 送信失敗回数
   end
   
   attr_reader(:start_time, :recv_count, :send_count, :recv_fail_count, :send_fail_count)
@@ -541,11 +559,13 @@ class DangoServerFramework
   # セッション
   def session_init # セッション情報の初期化
     @session_list = {}
+    @session_th_list = {}
   end
   def session
     if !Thread.current[:session]
       Thread.current[:session] = {}
       @session_list[Thread.current.object_id] = Thread.current[:session]
+      @session_th_list[Thread.current.object_id] = Thread.current
     end
     Thread.current[:session]
 #    sid = Thread.current.object_id
@@ -554,9 +574,11 @@ class DangoServerFramework
   end
   def session_del # セッション情報の初期化
     @session_list.delete(Thread.current.object_id)
+    @session_th_list.delete(Thread.current)
   end
   
   attr_reader(:session_list)
+  attr_reader(:session_th_list)
   
   # ソケットとIDの対応
   def socket_list_init
@@ -602,14 +624,16 @@ class DangoServerFramework
         begin
           sleep @gc_interval_sec
           
+          Thread.critical = true
           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 "
+          Thread.critical = false
           
-        rescue
+        rescue Exception
           logger.error "Exception gc_thread_start  #{error_message($!, 'u')}"
         end
       end
@@ -619,7 +643,7 @@ class DangoServerFramework
   
   # ハートビートスレッドの開始
   def heart_beat_thread_start
-    shared[:heart_beat_time_hash] = {}
+    shared[:_heart_beat_time_hash] = {}
     
     th = Thread.start do
       loop do
@@ -630,7 +654,7 @@ class DangoServerFramework
             logger.debug "heart_beat_thread_start "
             
             # クライアントから来るハートビートのチェック
-            heart_beat_time_hash = shared[:heart_beat_time_hash]
+            heart_beat_time_hash = shared[:_heart_beat_time_hash]
             
             # 全員へheart_beatパケットを送信
             socket_list.keys.each do |sid|
@@ -638,15 +662,17 @@ class DangoServerFramework
 #              logger.debug "heart_beat_thread_start:sid=#{sid} #{sock} #{sock.closed?}"
 #              send_notice(sid, "_heart_beat", {}, {:timeout=>@heart_beat_response_wait_sec})
               
-              # クライアントから来たハートビートの時間チェック
+              # クライアントから来たハートビートの時間チェックし、古ければsocketを閉じて、threadを殺す
               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]}:#{sock}:#{sock.closed?}"
+                logger.warn "!!!! heart_beat_thread_start:heart beat old:#{sid}:#{heart_beat_time_hash[sid]}:#{sock}:#{sock.closed?}"
                 sock.close if !sock.closed?
+                logger.warn "!!!! heart_beat_thread_start:thread kill:#{session_th_list[sid]}"
+                session_th_list[sid].kill
               end
             end
           end
           
-        rescue
+        rescue Exception
           logger.error "Exception heart_beat_thread_start  #{error_message($!, 'u')}"
         end
       end
@@ -658,7 +684,7 @@ class DangoServerFramework
   def dango_receive__notice_heart_beat(ret_obj)
     logger.debug "dango_receive__notice_heart_beat:#{session[:sid]}:#{ret_obj['_hb_id']} " 
     
-    shared.transaction(:heart_beat_time_hash) do |heart_beat_time_hash|
+    shared.transaction(:_heart_beat_time_hash) do |heart_beat_time_hash|
       heart_beat_time_hash[session[:sid]] = Time.now
       heart_beat_time_hash
     end
@@ -666,7 +692,7 @@ class DangoServerFramework
   
   # サーバーからクライアントへのデータ送信
   def send_notice(sid, notice_name, send_obj, options = {})
-    logger.debug "send_notice(#{sid.inspect}, #{notice_name.inspect}) "
+    logger.info "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)
@@ -711,9 +737,11 @@ class DangoServerFramework
                 dango_send_data(sock, send_obj_dup, :type=>dtype) # データ送信
 #                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} "
+                logger.warn "send_notice:DangoFrameworkConnectionError:notice_name=#{notice_name.inspect} #{sid} "
               rescue DangoFrameworkError
-                logger.debug "ERROR:send_notice:DangoFrameworkError:notice_name=#{notice_name.inspect} #{sid} \n #{error_message($!, 'u')}"
+                logger.warn "ERROR:send_notice:DangoFrameworkError:notice_name=#{notice_name.inspect} #{sid} \n #{error_message($!, 'u')}"
+              rescue Exception
+                logger.warn "ERROR:send_notice:Exception:notice_name=#{notice_name.inspect} #{sid} \n #{error_message($!, 'u')}"
               end
             end
             
@@ -745,10 +773,10 @@ class DangoServerFramework
                   if Time.now > 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" 
-                      sock.close if !sock.closed?
-                    end
+#                    if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
+#                      logger.info "!!!! send_notice:heart_beat timeout" 
+#                      sock.close if !sock.closed?
+#                    end
                     break
                   end
                   
@@ -760,8 +788,8 @@ class DangoServerFramework
               end
             end
           end # mutex
-        rescue
-          logger.debug "send_response_thread error:#{error_message($!, 'u')}"
+        rescue Exception
+          logger.error "send_response_thread error:#{error_message($!, 'u')}"
         end
       end # Thread:end
       
@@ -776,7 +804,7 @@ class DangoServerFramework
       key = $1
       method_action_notice_shared(key, name, *args)
     else
-      logger.info "method not found. #{name.inspect} #{args.inspect}"
+      logger.error "method not found. #{name.inspect} #{args.inspect}"
       raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
     end
   end
@@ -790,21 +818,21 @@ class DangoServerFramework
   
   # メインループ用の定義をするためのメソッド
   def flameloop_thread(loop_method, options={})
-    logger.debug "flameloop_thread options:#{options.inspect}"
+    logger.warn "flameloop_thread options:#{options.inspect}"
 
     options = options.deep_dup
     options[:rate] ||= 10
     
     wait_sec = 1.0 / options[:rate]
-    logger.debug "flameloop_thread wait_sec:#{wait_sec.inspect}"
+    logger.warn "flameloop_thread wait_sec:#{wait_sec.inspect}"
     
     th = Thread.new do 
       loop do
         @mutex_proc_thread.synchronize do
           begin
             __send__(loop_method)
-          rescue
-            logger.debug "flameloop_thread error:#{error_message($!, 'u')}"
+          rescue Exception
+            logger.error "flameloop_thread error:#{error_message($!, 'u')}"
           end
         end
         sleep wait_sec

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 36
+    TINY  = 37
 
     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.36
-date: 2007-11-20 00:00:00 +09:00
+  version: 0.0.37
+date: 2007-11-28 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib
@@ -31,7 +31,7 @@ authors:
 files: 
 - Manifest.txt
 - README.txt
-- MIT-LICENSE
+- LICENSE
 - lib/dango/client_framework.rb
 - lib/dango/framework_base.rb
 - lib/dango/server_framework.rb

data/MIT-LICENSE

@@ -1,21 +0,0 @@
-Copyright (c) 2007 Keisuke Minami
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-