dango 0.4.8 → 0.5.0

data/lib/dango/client_framework.rb

@@ -73,7 +73,8 @@ class DangoClientFramework
     @log_shift_age = @connection_client_log_shift_age
     
     # loggerの準備
-    logger.debug("-------client initialize host=#{@connection_client_host} port=#{@connection_client_port}")
+    logger.info("-------client initialize")
+    logger.info("host=#{@connection_client_host} port=#{@connection_client_port}")
     logger.info("@log_file      = #{@log_file}")
     logger.info("@log_level     = #{@log_level}")
     logger.info("@log_max_size  = #{@log_max_size}")
@@ -81,7 +82,7 @@ class DangoClientFramework
     
     # データ送受信用の共有メモリ初期化
     send_return_shared_init()
-    @send_receive_mutex = Mutex.new # 送受信用の排他処理
+    @send_receive_mutex = DangoMutex.new(:send_receive_mutex) # 送受信用の排他処理
     
     # 通知共有メモリの初期化
     dango_client_notice_shared_init()
@@ -101,7 +102,7 @@ class DangoClientFramework
     @sock.sync = true
     logger.debug("addr:#{@sock.addr.inspect}")
     
-    @tmutex = Mutex.new # sockの排他処理用
+    @tmutex = DangoMutex.new(:tmutex) # sockの排他処理用
     
     dango_heart_beat_thread_init() # ハートビート送信スレッドの起動
     
@@ -150,12 +151,12 @@ class DangoClientFramework
                 __send__("dango_receive_#{notice_name}", ret_obj)
               rescue
                 logger.error "error in dango_receive_#{notice_name} #{@sid} \n#{error_message($!, 'u')}"
-              ensure
-                # データの受信の送信返し
-                response_notice_name = "_response"
-                send_obj = {"_id" => ret_obj["_id"]}
-                send_action(response_notice_name, send_obj)
-                logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid} "
+#              ensure
+#                # データの受信の送信返し
+#                response_notice_name = "_response"
+#                send_obj = {"_id" => ret_obj["_id"]}
+#                send_action(response_notice_name, send_obj)
+#                logger.debug "response_notice_name=#{response_notice_name.inspect} #{@sid} "
               end
               logger.debug "called method=#{notice_name.inspect} #{@sid} "
             end
@@ -243,7 +244,7 @@ class DangoClientFramework
   def dango_client_send_encrypt(str) # 継承用
     str
   end
-  def dango_send_encrypt(str) # フレームワークから呼ばれる部分
+  def send_encrypt(str) # フレームワークから呼ばれる部分
     dango_client_send_encrypt(str)
   end
   
@@ -251,7 +252,7 @@ class DangoClientFramework
   def dango_client_receive_decrypt(str) # 継承用
     str
   end
-  def dango_receive_decrypt(str) # フレームワークから呼ばれる部分
+  def receive_decrypt(str) # フレームワークから呼ばれる部分
     dango_client_receive_decrypt(str)
   end
   
@@ -275,7 +276,7 @@ class DangoClientFramework
     return_name = options[:return_name] || ("return_" + action_name.to_s).to_sym
     timeout = options[:timeout] || 6
     
-    @send_receive_mutex.synchronize do
+    @send_receive_mutex.timeout_sync(10, :send_return) do
       send_return_shared[action_name] = nil
       
       receive_thread = nil

data/lib/dango/controller_plugin/dango_controller_plugin.rb

@@ -4,6 +4,7 @@
 = Dangoサーバーのメンテナンス用モニタ
 =end
 
+require "timeout"
 
 # モニター用のdangoクライアントクラス
 module DangoControllerPlugin
@@ -18,10 +19,13 @@ module DangoControllerPlugin
   def self.dango_server_call(method_name, arg, options = {})
     config = dango_server_config(options)
     raise("backdoor_run_drb_server is false.") if !config['server']['backdoor_run_drb_server']
-    drb_uri = "druby://#{config['network']['host']}:#{config['server']['backdoor_run_drb_port']}"
+#    drb_uri = "druby://#{config['network']['host']}:#{config['server']['backdoor_run_drb_port']}"
+    drb_uri = config['server']['backdoor_run_drb_url']
     begin
-      drb_obj = DRbObject.new_with_uri(drb_uri)
-      drb_obj.__send__(method_name.to_s, arg)
+      timeout(3) do
+        drb_obj = DRbObject.new_with_uri(drb_uri)
+        drb_obj.__send__(method_name.to_s, arg)
+      end
     rescue Exception
       raise("DRbError:#{$!.class} #{$!.message} #{$!.backtrace.inspect}")
     end

data/lib/dango/dango_g_server.rb

@@ -98,10 +98,10 @@ class GServer
   end
 
   @@services = {}   # Hash of opened ports, i.e. services
-  @@servicesMutex = Mutex.new
+  @@servicesMutex = DangoMutex.new(:gServer_servicesMutex)
 
   def GServer.stop(port, host = DEFAULT_HOST)
-    @@servicesMutex.synchronize {
+    @@servicesMutex.timeout_sync(10, :GServer_stop) {
       @@services[host][port].stop
     }
   end
@@ -112,9 +112,9 @@ class GServer
   end
 
   def stop
-    @connectionsMutex.synchronize  {
+    @connectionsMutex.timeout_sync(10, :stop)  {
       if @tcpServerThread
-        @tcpServerThread.raise "stop"
+        @tcpServerThread.raise "stop. "
       end
     }
   end
@@ -182,7 +182,7 @@ class GServer
     @host = host
     @maxConnections = maxConnections
     @connections = []
-    @connectionsMutex = Mutex.new
+    @connectionsMutex = DangoMutex.new(:gServer_connectionsMutex)
     @connectionsCV = ConditionVariable.new
     @stdlog = stdlog
     @audit = audit
@@ -204,6 +204,7 @@ class GServer
       @@services[@host][@port] = self;
     }
     @tcpServerThread = Thread.new {
+      Thread.current[:_name] = "thread gserver tcpServerThread"
       begin
         starting if @audit
         while !@shutdown
@@ -249,7 +250,7 @@ class GServer
           @connections.each { |c| c.raise "stop" }
         end
         @tcpServerThread = nil
-        @@servicesMutex.synchronize  {
+        @@servicesMutex.timeout_sync(10, :stopping)  {
           @@services[@host].delete(@port)
         }
         stopping if @audit

data/lib/dango/dango_logger.rb

@@ -0,0 +1,115 @@
+#!ruby -Ku
+
+=begin
+= dango用のlogger
+=end
+
+
+require 'logger'
+require 'thread'
+require 'pp'
+
+
+# クライアントとサーバーで共有するモジュール
+module DangoLoggerModule
+  # ロガーの定義
+  def logger
+#   if !@dango_logger                                            # これだと警告が出てうざいので
+    if !self.instance_variables.find{|iv| iv == '@dango_logger'} # @dango_loggerが未定義なら
+      # loggerの初回呼び出し時
+      @dango_logger = DangoLogger.new(@log_file, @log_shift_age, @log_max_size, @log_level)
+    end
+    
+    @dango_logger
+  end
+end
+
+# Dango用のロガークラス
+class DangoLogger
+  include ErrorMessage
+
+  def initialize(log_file, log_shift_age, log_max_size, log_level)
+    @log_file = log_file
+    @log_shift_age = log_shift_age
+    @log_max_size = log_max_size
+    @log_level = log_level
+    
+    if @log_file && @log_file != "" # 出力ファイルが空なら何もしない
+      @is_logging = true 
+    else
+      @is_logging = false
+    end
+    
+    if @is_logging
+      log_dir = File.dirname(@log_file)
+      Dir.mkdir(log_dir) if !File.exist?(log_dir)
+      @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) 
+        now = Time.now
+        now_str = now.strftime("%Y-%m-%d %H:%M:%S.") << "%06d" % now.usec
+        "%1.1s, [%s] %s:%s\n" % [severity, now_str, msg, 
+                                    progname]
+      end
+      @dango_logger.add(1, "--- start log ---", "logger")
+      
+      @log_queue = Queue.new
+      
+      Thread.start do 
+        # logger作成
+        loop do
+          begin
+            data = @log_queue.pop
+            @dango_logger.add(data[:sev], data[:msg], data[:prg])
+          rescue Exception
+            puts "dango_logger:#{error_message($!, 'u')}"
+            exit! # ログのトラブルが出た場合は強制終了
+          end
+        end
+      end # Thread.end
+    end
+  end
+  
+  def debug(msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>0, :msg=>msg, :prg=>Thread.current.object_id})
+    end
+  end
+  
+  def info(msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>1, :msg=>msg, :prg=>Thread.current.object_id})
+    end
+  end
+  
+  def warn(msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>2, :msg=>msg, :prg=>Thread.current.object_id})
+    end
+  end
+  
+  def error(msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>3, :msg=>msg, :prg=>Thread.current.object_id})
+    end
+  end
+  
+  def fatal(msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>4, :msg=>msg, :prg=>Thread.current.object_id})
+    end
+  end
+  
+  def unknown(msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>5, :msg=>msg, :prg=>Thread.current.object_id})
+    end
+  end
+  
+  def add(sev, msg = "")
+    if @is_logging
+      @log_queue.push({:sev=>sev, :msg=>str, :prg=>Thread.current.object_id})
+    end
+  end
+end
+

data/lib/dango/dango_mutex.rb

@@ -0,0 +1,64 @@
+#!ruby -Ku
+
+=begin
+= Dango用のMutex
+=end
+
+
+require 'thread'
+
+# Mutexクラスの名前情報機能追加
+class DangoMutex < Mutex
+  def initialize(mutex_name = nil)
+    @mutex_name = mutex_name.to_s
+    @lock_name = ""
+    super()
+  end
+  
+  attr_reader(:mutex_name, :lock_name)
+  
+  # タイムアウトする排他処理
+  def timeout_sync(sec = 10, lock_name = "")
+    ret = nil
+    begin
+      timeout(sec, DangoFrameworkMutexTimeoutException) do
+        self.synchronize do
+          @lock_name = lock_name
+          ret = yield
+        end
+      end
+      
+    rescue DangoFrameworkMutexTimeoutException, Timeout::Error, TimeoutError
+      
+      # なぜかDangoFrameworkMutexTimeoutException以外の例外クラスが飛ぶことがあるので
+      if $!.class == DangoFrameworkMutexTimeoutException
+        error_msg = ""
+      else
+        error_msg = "#{$!.class}:"
+      end
+      
+      locked_msg = ""
+      ObjectSpace.each_object(DangoMutex) do |object|
+        if object.locked?
+          locked_msg += "#{object.mutex_name.to_s}(#{object.lock_name.to_s}) "
+        end
+      end
+      
+      error_msg += "DangoFrameworkMutexTimeoutException" + 
+                   "self=#{self.mutex_name}(#{lock_name})\n" + 
+                   "locked_mutex=#{locked_msg}\n" + 
+                   "#{$!.message}\n" + 
+                   "#{$!.backtrace.pretty_inspect}"
+      
+      raise(DangoFrameworkMutexTimeoutException, error_msg)
+      
+    rescue Exception
+      puts "#{$!.class} #{$!.message}\n#{$!.backtrace.pretty_inspect}"
+      
+      raise
+    end
+    
+    ret
+  end
+end
+

data/lib/dango/default_dango_receive.rb

@@ -0,0 +1,140 @@
+#!ruby -Ku
+
+=begin
+= デフォルトのdango_receive_*群
+=end
+
+# デフォルトのdango_receive_*群
+module DefaultDangoReceive
+  # クライアントから来たheart_beatなら
+  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|
+      heart_beat_time_hash[session[:sid]] = Time.now
+      shared.commit(heart_beat_time_hash)
+    end
+  end
+  
+  # action_nameがエンコード変更なら
+  def dango_receive__change_encode_type(ret_obj)
+    logger.debug "dango_receive__change_encode_type: #{ret_obj['encode_type'].inspect}"
+    session[:encode_type] = ret_obj['encode_type']
+  end
+  
+  
+  
+  ################## メンテナンスアクション系 ##################
+  
+  public
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_receive__monitor_get_server_info(ret_obj)
+    logger.debug "dango_receive__monitor_get_server_info:#{ret_obj.inspect}"
+    dango_check_monitor_error()
+    
+    get_server_info = {
+      'server_start_time' => start_time.strftime("%Y-%m-%d %H:%M:%S"),
+      'up_time'           => Time.now - start_time,
+      
+      'recv_count'      => recv_count, # 受信回数
+      'send_count'      => send_count, # 送信回数
+      'recv_fail_count' => recv_fail_count, # 受信失敗回数
+      'send_fail_count' => send_fail_count, # 送信失敗回数
+      
+      'log_level'     => log_level_str,
+      'log_file'      => log_file,
+      'log_max_size'  => log_max_size,
+      'log_shift_age' => log_shift_age,
+    }
+    
+    send_obj = {'code'=>0, 'get_server_info'=>get_server_info}
+    send_notice('return__monitor_get_server_info', session[:sid], send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_receive__monitor_get_shared(ret_obj)
+    logger.debug "dango_receive__monitor_get_shared:#{ret_obj.inspect}"
+    dango_check_monitor_error()
+    
+    send_obj = {'code'=>0, 'get_shared'=>shared.to_hash}
+    send_notice('return__monitor_get_shared', session[:sid], send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_receive__monitor_get_session_list(ret_obj)
+    logger.debug "dango_receive__monitor_get_session_list:#{ret_obj.inspect}"
+    dango_check_monitor_error()
+    
+    send_obj = {'code'=>0, 'get_session_list'=>session_list}
+    send_notice('return__monitor_get_session_list', session[:sid], send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーからクライアントへのデータ送信
+  def dango_receive__monitor_get_socket_list(ret_obj)
+    logger.debug "dango_receive__monitor_get_socket_list:#{ret_obj.inspect}"
+    dango_check_monitor_error()
+    
+    send_obj = {'code'=>0, 'get_socket_list'=>socket_list.keys}
+    send_notice('return__monitor_get_socket_list', session[:sid], send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：サーバーデータ再読み込み
+  def dango_receive__monitor_server_reload(ret_obj)
+    logger.debug "dango_receive__monitor_server_reload"
+    dango_check_monitor_error()
+    
+    @server_reload = true
+    logger.debug "@server_reload=#{@server_reload.inspect}"
+    send_obj = {'code'=>0, 'message'=>'success'}
+    send_notice('return__monitor_server_reload', session[:sid], send_obj, :type=>2)
+  end
+  
+  # メンテナンスコマンド：接続者全員へメッセージ送信
+  def dango_receive__monitor_send_system_message(ret_obj)
+    logger.debug "dango_receive__monitor_send_system_message:#{ret_obj.inspect}"
+    dango_check_monitor_error()
+    
+    # 全員へ_notice_system_messageを通知
+    socket_list.keys.each do |sid|
+      next if session[:sid] == sid
+      send_obj = { "message" => ret_obj["message"] }
+      send_notice('_notice_system_message', sid, send_obj)
+    end
+    
+    send_obj = {'code'=>0, }
+    send_notice('return__monitor_send_system_message', session[:sid], send_obj, :type=>2)
+  end
+  
+  private
+  # メンテナンスコマンド：エラーの場合
+  def dango_check_monitor_error()
+    action_name = session[:_action_name]
+    peerhost = session[:peer_host]
+    peeraddr = session[:peer_ip_address]
+    
+    logger.debug "dango_check_monitor_error:peerhost=#{peerhost.inspect} peeraddr=#{peeraddr.inspect} @backdoor_host=#{@backdoor_host.inspect}"
+    
+    match = false
+    if peerhost == backdoor_host # ホスト名で書いてある時の一致確認
+      match = true
+    else
+      begin # IPアドレスの一致確認
+#        match = true if IPAddr.new(@backdoor_host).include?(peeraddr)
+        if IPAddr.new(@backdoor_host).include?(IPAddr.new(peeraddr))
+          match = true
+        end
+      rescue
+      end
+    end
+    
+    if !match
+      notice_name = "return_" + action_name
+      send_obj = {'code'=>1, 'message'=>"error your ip address"}
+      send_notice(notice_name, session[:sid], send_obj, :type=>2)
+      raise(DangoFrameworkMonitorSecurityError)
+    end
+  end
+  
+  
+end
+