dango 0.0.35 → 0.0.36

data/lib/dango/client_framework.rb

@@ -57,6 +57,8 @@ class DangoClientFramework
     
     @log_file = @connection_client_log_file
     @log_level = @connection_client_log_level
+    @log_max_size = 1048576
+    @log_shift_age = 99
     
     # loggerの準備
     logger.debug("-------client initialize host=#{@connection_client_host} port=#{@connection_client_port}")

data/lib/dango/framework_base.rb

@@ -45,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-%d %H:%M:%S.") << "%06d" % now.usec
   end
 end
 
@@ -53,6 +53,7 @@ end
 class DangoFrameworkError < StandardError; end
 class DangoFrameworkTimeoutError < DangoFrameworkError; end
 class DangoFrameworkConnectionError < DangoFrameworkError; end
+class DangoFrameworkDisconnectError < DangoFrameworkError; end
 class DangoFrameworkReadNoDataError < DangoFrameworkError; end
 class DangoFrameworkFlashPolicyError < DangoFrameworkError; end
 class DangoFrameworkMonitorSecurityError < DangoFrameworkError; end
@@ -119,7 +120,7 @@ module DangoFrameworkModule
       if @log_file != ""
         log_dir = File.dirname(@log_file)
         Dir.mkdir(log_dir) if !File.exist?(log_dir)
-        @dango_logger = Logger.new(@log_file)
+        @dango_logger = Logger.new(@log_file, @log_shift_age, @log_max_size)
         @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"
@@ -148,7 +149,7 @@ module DangoFrameworkModule
     rescue EOFError, IOError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNABORTED
       # 接続終了時の切断と思われるものはDangoFrameworkConnectionErrorにしない
       #raise(DangoFrameworkError, "failed to read sock for EOF reached.\n#{error_message($!, 'u')}")
-      raise(DangoFrameworkError, "failed to read sock for EOF reached (and so on). sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
+      raise(DangoFrameworkDisconnectError, "failed to read sock for EOF reached (and so on). sock=#{sock.inspect} #{$!.class} toid=#{Thread.current.object_id}")
     rescue
       raise(DangoFrameworkConnectionError, "failed to read sock. sock=#{sock.inspect} toid=#{Thread.current.object_id}\n#{error_message($!, 'u')}")
     end
@@ -168,7 +169,7 @@ module DangoFrameworkModule
     ## サイズとデータタイプを取得
     dtype, size = size_str[0, 5].unpack("cN")
     
-    ## データが小さすぎる場合
+    ## データがない場合
     if size == nil || size == 0
       raise(DangoFrameworkConnectionError, "toid=#{Thread.current.object_id}:size=#{size}:size_str=#{size_str.inspect}") 
     end

data/lib/dango/monitor/server_monitor_action.rb

@@ -82,6 +82,12 @@ class ServerMonitorAction
       'send_count'      => @parent.send_count, # 送信回数
       'recv_fail_count' => @parent.recv_fail_count, # 受信失敗回数
       'send_fail_count' => @parent.send_fail_count, # 送信失敗回数
+      
+      'log_level'     => @parent.log_level_str,
+      'log_file'      => @parent.log_file,
+      'log_max_size'  => @parent.log_max_size,
+      'log_shift_age' => @parent.log_shift_age,
+      
 #      'dummy' => "dummy "*1000, # ダミー情報
     }
     

data/lib/dango/server_framework.rb

@@ -21,6 +21,12 @@ class DangoServerFramework
   DefaultServerHost = 'localhost'     # デフォルトのホスト名 # 接続制限ホスト "0.0.0.0"にすれば全接続オッケイ
   DefaultMaxConnections = 10          # デフォルトの最大接続人数
   
+  DefaultLogFile     = "log/dango_development.log"
+  DefaultLogLevel    = Logger::INFO
+  DefaultLogMaxSize  = 1048576
+  DefaultLogShiftAge = 99
+  DefaultGServerLogFile     = ""
+
   # ここから先は普通は変更しなくていいだろうというもの
   SendReceiveSleepIntervalSec = 0.2   # データ送信時のタイムアウトチェック間隔秒
   SendReceiveTimeoutDefaultSec = 5.0  # データ送受信時のデフォルトタイムアウト秒数
@@ -48,6 +54,14 @@ class DangoServerFramework
     def disconnecting(sock)
       @parent.disconnecting(sock)
     end
+    
+    def starting()
+      @parent.starting()
+    end
+    
+    def stopping()
+      @parent.stopping()
+    end
   end
   
   def initialize(config)
@@ -58,6 +72,16 @@ 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!
     end
@@ -85,9 +109,9 @@ class DangoServerFramework
     
     logger.info("===== server initialize =====") # loggerの準備
     logger.info("Process.pid=#{Process.pid}")
-    logger.info("port=#{@connection_server_port}")
-    logger.info("host=#{@connection_server_host}")
-    logger.info("max_connections=#{@connection_server_max_connections}")
+    logger.info("port=#{@server_port}")
+    logger.info("host=#{@server_host}")
+    logger.info("max_connections=#{@server_max_connections}")
     
     open("tmp/pids/dango.pid", "wb"){|fh| fh.write Process.pid.to_s }
     
@@ -107,13 +131,15 @@ class DangoServerFramework
     TCPSocket.do_not_reverse_lookup = true # 逆引きを行わない
 #    TCPSocket.do_not_reverse_lookup = false # 逆引きを行う
     
-    @gserver = DangoGServer.new(self, @connection_server_port, 
-                                @connection_server_host, 
-                                @connection_server_max_connections)
+    @gserver = DangoGServer.new(self, @server_port, @server_host, @server_max_connections)
     @gserver.audit = true                 # Turn logging on.
+    @gserver.debug = true                 # debug
+    
+    if @gserver_log_file && @gserver_log_file != ""
+      gserver_log_fh = open(@gserver_log_file, "a")
+      @gserver.stdlog = gserver_log_fh
+    end
     
-    GC.enable
-    GC.start 
     GC.disable
     
     begin
@@ -201,6 +227,20 @@ class DangoServerFramework
     logger.info "disconnecting:port=#{port}"
   end
   
+  # gserver開始処理
+  def starting()
+    msg = "#{self.class.to_s} #{@server_host}:#{@server_port}/#{@server_max_connections} start"
+    logger.warn msg
+    puts "[#{Time.now_to_s}] #{msg}"
+  end
+  
+  # gserver終了処理
+  def stopping()
+    msg = "#{self.class.to_s} #{@server_host}:#{@server_port} stop"
+    logger.warn msg
+    puts "[#{Time.now_to_s}] #{msg}"
+  end
+  
   # gserverのserveメソッド：スレッド開始処理
   def thread_main(sock)
     logger.info "#{sock} is accepted. thread.current=#{Thread.current.object_id} "
@@ -294,12 +334,16 @@ class DangoServerFramework
       logger.debug "Monitor Security Error #{sid} "
       
     rescue DangoFrameworkReadNoDataError
+      @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
       logger.debug "read no data. maybe client closed. #{sid} "
       
     rescue DangoFrameworkConnectionError
       @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
       logger.debug "connection error. #{sid} \n#{error_message($!, 'u')}"
       
+    rescue DangoFrameworkDisconnectError
+      logger.debug "DangoFrameworkDisconnectError. #{sid} \n#{error_message($!, 'u')}"
+      
     rescue DangoFrameworkError
       logger.debug "DangoFrameworkError. #{sid} \n#{error_message($!, 'u')}"
       
@@ -346,10 +390,14 @@ class DangoServerFramework
     Thread.abort_on_exception = true if @server_debug
     
     # 変数の初期設定
-    @connection_server_port            = @config['network']['port'] || DefaultNetworkPort
-    @connection_server_host            = @config['server']['host'] || DefaultServerHost
-    @connection_server_max_connections = @config['server']['max_connections'] || DefaultMaxConnections
-    @log_file                          = @config['server']['log_file'] || ""
+    @server_port                       = @config['network']['port'] || DefaultNetworkPort
+    @server_host                       = @config['server']['host'] || DefaultServerHost
+    @server_max_connections            = @config['server']['max_connections'] || DefaultMaxConnections
+    @log_file                          = @config['server']['log_file'] || DefaultLogFile
+    @log_max_size                      = @config['server']['log_max_size'] || DefaultLogMaxSize
+    @log_shift_age                     = @config['server']['log_shift_age'] || DefaultLogShiftAge
+    @gserver_log_file                  = @config['server']['gserver_log_file'] || DefaultGServerLogFile
+    
     @policy_file_request               = @config['server']['policy_file_request'] || true
     @send_receive_sleep_interval_sec   = @config['server']['send_receive_sleep_interval_sec'] || SendReceiveSleepIntervalSec
     @send_receive_timeout_default_sec  = @config['server']['send_receive_timeout_default_sec'] || SendReceiveTimeoutDefaultSec
@@ -359,7 +407,7 @@ class DangoServerFramework
     @heart_beat_receive_wait_sec       = @config['server']['heart_beat_receive_wait_sec'] || HeartBeatReceiveWaitSec
     @gc_interval_sec                   = @config['server']['gc_interval_sec'] || GCIntervalSec
     
-    
+    # ログレベルの設定
     log_level_hash = {
       "FATAL" => Logger::FATAL, 
       "ERROR" => Logger::ERROR, 
@@ -367,10 +415,15 @@ class DangoServerFramework
       "INFO"  => Logger::INFO, 
       "DEBUG" => Logger::DEBUG, 
     }
-    @log_level = log_level_hash.find do |level|
-      level == @config['server']['log_level']
+    log_level_hash.each do |str, const|
+      @log_level = const if str.downcase == @config['server']['log_level'].downcase
     end
-    @log_level = @connection_server_log_level || Logger::DEBUG
+    @log_level = @log_level || DefaultLogLevel
+    
+    log_level_hash.each do |str, const|
+      @log_level_str = str if const == @log_level
+    end
+    
     
     @start_time = Time.now # サーバー起動時間
     @recv_count = 0 # 受信回数
@@ -380,6 +433,7 @@ class DangoServerFramework
   end
   
   attr_reader(:start_time, :recv_count, :send_count, :recv_fail_count, :send_fail_count)
+  attr_reader(:log_level_str, :log_file, :log_max_size, :log_shift_age)
   
   def dango_server_init # 初期設定
   end

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 35
+    TINY  = 36
 
     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.35
-date: 2007-11-13 00:00:00 +09:00
+  version: 0.0.36
+date: 2007-11-20 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib