dango 0.4.8 → 0.5.0

data/lib/dango/error_message.rb

@@ -0,0 +1,30 @@
+#!ruby -Ku
+
+=begin
+= エラーメッセージ出力用
+=end
+
+
+require 'pp'
+
+
+# エラー出力用モジュール
+module ErrorMessage
+  # デバッグ出力用のメソッド
+  def error_message(exception_class, code = nil)
+    if exception_class.kind_of?(Exception)
+      "#{exception_class.class} is not Exception class"
+    end
+    
+    str = "class=#{exception_class.class}\n" + 
+          "message=#{exception_class.message}\n" + 
+          "backtrace=#{exception_class.backtrace.pretty_inspect}"
+    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"
+      str = str.tosjis
+    end
+    str
+  end
+end
+

data/lib/dango/framework_base.rb

@@ -7,7 +7,6 @@
 
 require 'socket'
 require 'logger'
-require 'thread'
 require 'timeout'
 require 'yaml'
 require "stringio"
@@ -18,8 +17,26 @@ require "fcntl"
 require "rubygems"
 require 'json/add/rails'
 
+require 'thread'
+#require 'fastthread'
 
-require "dango/shared/memory_store.rb"
+require "dango/error_message"
+require "dango/dango_logger"
+require "dango/dango_mutex"
+require "dango/shared/memory_store"
+
+
+# 例外定義
+class DangoFrameworkException < StandardError; end
+class DangoFrameworkTimeoutException < DangoFrameworkException; end
+class DangoFrameworkConnectionException < DangoFrameworkException; end
+class DangoFrameworkDisconnectException < DangoFrameworkException; end
+class DangoFrameworkReadNoDataException < DangoFrameworkException; end
+class DangoFrameworkReadTimeoutException < DangoFrameworkException; end
+class DangoFrameworkFlashPolicyException < DangoFrameworkException; end
+class DangoFrameworkMonitorSecurityException < DangoFrameworkException; end
+class DangoFrameworkTransactionException < DangoFrameworkException; end
+class DangoFrameworkMutexTimeoutException < DangoFrameworkException; end
 
 
 class Object
@@ -31,7 +48,6 @@ class Object
         sio.rewind
         sio.read
       end
-      
       str
     end
   end
@@ -44,45 +60,18 @@ end
 # Timeクラスの表示形式修正
 class Time
   def self.now_to_s
-#    self.strftime("%Y-%m-%d %H:%M:%S")
     now = self.now
     now.strftime("%Y-%m-%d %H:%M:%S.") << "%06d" % now.usec
   end
-end
-
-# 例外定義
-class DangoFrameworkException < StandardError; end
-class DangoFrameworkTimeoutException < DangoFrameworkException; end
-class DangoFrameworkConnectionException < DangoFrameworkException; end
-class DangoFrameworkDisconnectException < DangoFrameworkException; end
-class DangoFrameworkReadNoDataException < DangoFrameworkException; end
-class DangoFrameworkReadTimeoutException < DangoFrameworkException; end
-class DangoFrameworkFlashPolicyException < DangoFrameworkException; end
-class DangoFrameworkMonitorSecurityException < DangoFrameworkException; end
-class DangoFrameworkTransactionException < DangoFrameworkException; end
-
-
-# エラー出力用モジュール
-module ErrorMessage
-  # デバッグ出力用のメソッド
-  def error_message(exception_class, code = nil)
-    if exception_class.kind_of?(Exception)
-      "#{exception_class.class} is not Exception class"
-    end
-    
-    str = "#{exception_class.class}:#{exception_class.message}\n" + 
-          "#{exception_class.backtrace.pretty_inspect}"
-    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"
-      str = str.tosjis
-    end
-    str
+  def to_ss
+    self.strftime("%Y-%m-%d %H:%M:%S.") << "%06d" % self.usec
   end
 end
 
 # ユーティティ
 module DangoUtilModule
+  include ErrorMessage
+
   # 配列をランダムに並べ替え
   # arrは順番を入れ替えたい配列
   # numは入れ替え回数（省略時2、大きな数を入れると確実にランダムになるが時間が掛かる）
@@ -97,11 +86,71 @@ module DangoUtilModule
 #    end
 #    ret_arr
   end
+  
+  def get_process_info(pid_orig = nil) # プロセス情報取得
+    if pid_orig
+      pid = pid_orig.deep_dup
+    else
+      pid = Process.pid
+    end
+    
+    ret = ""
+    ret += "=== get_process_info ===\n"
+    ret += "DangoUtilModule::pid = #{pid}\n"
+    ret += "DangoUtilModule::RUBY_VERSION      = #{RUBY_VERSION}\n"
+    ret += "DangoUtilModule::RUBY_RELEASE_DATE = #{RUBY_RELEASE_DATE}\n"
+    ret += "DangoUtilModule::RUBY_PLATFORM     = #{RUBY_PLATFORM}\n"
+    
+    if RUBY_PLATFORM == 'i386-mswin32'
+      
+    else
+      proc_process_dir = "/proc/#{pid}"
+      begin
+        if File.directory?(proc_process_dir)
+          # 開始時間
+          ret += "DangoUtilModule::process start time=#{File.mtime(proc_process_dir).to_ss}\n"
+          
+          # /proc/#{pid}/statusを読み込む
+          proc_process_status = "/proc/#{pid}/status"
+          
+          if File.file?(proc_process_status) && File.readable?(proc_process_status)
+            if RUBY_PLATFORM != 'i386-cygwin' # cygwinだとなぜか落ちるので分離
+              open(proc_process_status, "rb") do |fh|
+                ret += "DangoUtilModule::get_process_info:proc_process_status\n#{fh.read}\n"
+              end
+            end
+          end
+          
+          # /proc/#{pid}/fdの中の一覧を取得
+          proc_process_fd = "/proc/#{pid}/fd"
+          if File.directory?(proc_process_fd) && File.executable?(proc_process_fd)
+            ret += "DangoUtilModule::get_process_info:proc_process_fd:#{proc_process_fd}\n"
+            Dir.foreach(proc_process_fd) do |file|
+              file_fullpath = "#{proc_process_fd}/#{file}"
+              if File.symlink?(file_fullpath)
+                ret += "    #{file_fullpath} -> #{File.readlink(file_fullpath)}\n"
+              else
+                ret += "    #{file_fullpath}\n"
+              end
+            end
+          end
+        else
+          ret += "DangoUtilModule::#{proc_process_dir} is not exist"
+        end
+      rescue
+        ret += "DangoUtilModule:: #{error_message($!, 'u')}"
+      end
+    end
+    
+    ret
+  end
+  
 end
 
 # クライアントとサーバーで共有するモジュール
 module DangoFrameworkModule
   include ErrorMessage
+  include DangoLoggerModule
   
   CommMaxDigit = 5                 # 通信の最大桁数
   MaxLenRecv   = 1024              # 通信の一度の送信バイト数
@@ -131,45 +180,14 @@ module DangoFrameworkModule
     puts str
   end
   
-  # ロガーの定義
-  def logger
-#   if !@dango_logger                                            # これだと警告が出てうざいので
-    if !self.instance_variables.find{|iv| iv == '@dango_logger'} # @dango_loggerが未定義なら
-      
-      if @log_file == "" # ログを取らない設定の場合は
-        @dango_logger = "LOG NONE"
-        def @dango_logger.fatal(str); end
-        def @dango_logger.error(str); end
-        def @dango_logger.info(str) ; end
-        def @dango_logger.warn(str) ; end
-        def @dango_logger.debug(str); end
-        
-      else               # ログを取る設定の場合は
-        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] %d:%s %s\n" % [severity, now_str, Thread.current.object_id, progname, msg]
-        end
-      end
-      
-    end
-    
-    @dango_logger
-  end
-
-  attr(:dango_logger)
-
   # データ受信処理
   def dango_receive_data(sock)
-    logger.debug "dango_receive_data:start:sock=#{sock}"
     ret_data = ""
     
     begin
       size_str = sock.recv(CommMaxDigit + 1)
+      logger.debug "dango_receive_data:read header:sock=#{sock}"
+      
     rescue EOFError, IOError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ECONNABORTED
       # 接続終了時の切断と思われるものはDangoFrameworkConnectionExceptionにしない
       raise(DangoFrameworkDisconnectException, "failed to read sock for EOF reached (and so on). " + 
@@ -205,7 +223,10 @@ module DangoFrameworkModule
       raise(DangoFrameworkConnectionException, "too big... size=#{size}:size_str=#{size_str.inspect}")
     end
     
-    ret_data_orig = ""
+    logger.warn "warn size is too big ? size=#{size}:size_str=#{size_str.inspect}" if size > 10000
+    
+    
+    recv_data_orig = ""
     
     # 10秒でタイムアウトを起こす
     timeout(ReadTimeoutSec, DangoFrameworkReadTimeoutException) do 
@@ -214,34 +235,41 @@ module DangoFrameworkModule
       while size > 0
         read_len = MaxLenRecv > size ? size : MaxLenRecv
         begin
-          this_ret_data_orig = sock.recv(read_len)
+          this_recv_data_orig = sock.recv(read_len)
         rescue
           raise(DangoFrameworkConnectionException, "failed to read sock(data).\n#{error_message($!, 'u')}")
         end
         
-        ret_data_orig += this_ret_data_orig
+        recv_data_orig += this_recv_data_orig
         
-        size -= this_ret_data_orig.size
+        size -= this_recv_data_orig.size
       end
     end
     
-    ret_data = dango_receive_decrypt(ret_data_orig[0..-2])
+    recv_data = receive_decrypt(recv_data_orig[0..-2])
     
     @recv_count += 1 if @recv_count # 受信回数カウント
     
     begin
-      if ret_data == "" || ret_data == "{}" # データが空ならparseしない
-        data = []
+      if recv_data == "" || recv_data == "{}" # データが空ならparseしない
+        ret_data = []
       elsif encode_type == EncodeTypeJSON
-        data = JSON.parse(ret_data)
+        ret_data = JSON.parse(recv_data)
       elsif encode_type == EncodeTypeYAML
-        data = YAML::load(ret_data)
+        ret_data = YAML::load(recv_data)
       elsif encode_type == EncodeTypeMarshal
-        data = Marshal.load(ret_data)
+        ret_data = Marshal.load(recv_data)
+      end
+      
+      if ret_data.class != Array
+        raise(DangoFrameworkConnectionException, "data is not array.#{$!.class}\nret_data=#{ret_data}") 
       end
+      
     rescue
       raise(DangoFrameworkConnectionException, "data parse error.#{$!.class}\nret_data=#{ret_data}")
     end
+    
+    ret_data
   end
   
   # データ送信処理
@@ -251,7 +279,12 @@ module DangoFrameworkModule
     if send_objs == []
       send_data_orig = ""
     elsif encode_type == EncodeTypeJSON
-      send_data_orig = JSON.generate(send_objs)
+      begin
+        send_data_orig = JSON.generate(send_objs)
+      rescue
+        pp send_objs
+        raise
+      end
     elsif encode_type == EncodeTypeYAML
       send_data_orig = send_objs.to_yaml
     elsif encode_type == EncodeTypeMarshal
@@ -260,7 +293,7 @@ module DangoFrameworkModule
       send_data_orig = JSON.generate(send_objs)
     end
     
-    send_data = dango_send_encrypt(send_data_orig) + "\n"
+    send_data = send_encrypt(send_data_orig) + "\n"
     
     size = send_data.size
     

data/lib/dango/monitor/server_monitor_module.rb

@@ -0,0 +1,131 @@
+#!ruby -Ku
+
+=begin
+= Dangoサーバーのメインモジュール（drbで呼び出す用）
+=end
+
+# メインモジュール（drbで呼び出す用）
+module ServerMonitorModule
+  # drbから呼ばれるメンテナンス：サーバーからクライアントへのデータ送信
+  def _monitor_get_server_info(ret_obj)
+    logger.debug "_monitor_get_server_info"
+    
+    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,
+    }
+    
+    get_server_info
+  end
+  
+  # drbから呼ばれるメンテナンス：サーバーデータ再読み込み
+  def _monitor_server_reload(ret_obj)
+    logger.debug "_monitor_server_reload"
+    @server_reload = true
+    true
+  end
+  
+  # drbから呼ばれるメンテナンス：接続者全員へメッセージ送信
+  def _monitor_send_system_message(ret_obj)
+    logger.debug "_monitor_send_system_message"
+    
+    # 全員へ_notice_system_messageを通知
+    socket_list.all_sid.each do |sid|
+      next if session[:sid] == sid
+      send_obj = { "message" => ret_obj["message"] }
+      send_notice('_notice_system_message', sid, send_obj)
+    end
+    
+    true
+  end
+  
+  # drbから呼ばれるメンテナンス：スレッド一覧
+  def _monitor_thread_status(ret_obj)
+    logger.debug "_monitor_thread_status"
+    ret = []
+    
+    Thread.list.each do |th|
+      ret.push({
+        :object_id => th.object_id,
+        :name      => th[:_name] ? th[:_name] : "unknown(maybe drb thread)",
+      })
+    end
+    
+    ret
+  end
+  
+  # drbから呼ばれるメンテナンス：排他処理一覧
+  def _monitor_mutex_status(ret_obj)
+    logger.debug "_monitor_mutex_status"
+    ret = []
+    
+    ObjectSpace.each_object(DangoMutex) do |object|
+      ret.push({
+        :name    => object.mutex_name,
+        :is_lock => object.locked?, 
+      })
+    end
+    
+#    mutex_list = [
+#      [:mutex_send_response, @mutex_send_response],
+#      [:mutex_send_notice  , @mutex_send_notice],
+#      [:mutex_proc_thread  , @mutex_proc_thread],
+#      [:mutex_send_response, @mutex_send_response],
+#    ]
+#    @mutex_sock.each do |key, value|
+#      mutex_list.push(["mutex_sock #{key}", value])
+#    end
+#    
+#    mutex_list.each do |name, mutex|
+#      ret.push({
+#        :name    => name.to_s,
+#        :is_lock => mutex.locked?, 
+#      })
+#    end
+    
+    ret
+  end
+  
+  # drbから呼ばれるメンテナンス：shareの取得
+  # key value
+  def _monitor_get_shared(ret_obj)
+    logger.debug "_monitor_get_shared:ret_obj=#{ret_obj.inspect}"
+    shared.to_hash
+  end
+  
+  # drbから呼ばれるメンテナンス：shareの強制書き換え
+  # key value
+  def _monitor_write_shared(ret_obj)
+    logger.debug "_monitor_write_shared:ret_obj=#{ret_obj.inspect}"
+    logger.debug "_monitor_write_shared:value=#{eval(ret_obj['value']).inspect}"
+    
+    shared[ret_obj["key"]] = eval(ret_obj['value'])
+    true
+  end
+  
+  # drbから呼ばれるメンテナンス：session_listの取得
+  def _monitor_get_session_list(ret_obj)
+    logger.debug "_monitor_get_session_list:#{ret_obj.inspect}"
+    session_list
+  end
+  
+  # drbから呼ばれるメンテナンス：socket_listの取得
+  def _monitor_get_socket_list(ret_obj)
+    logger.debug "_monitor_get_socket_list:#{ret_obj.inspect}"
+    ret = {}
+    socket_list.all_sid.each{|sid| ret[sid] = socket_list[sid].object_id}
+    ret
+  end
+  
+end
+