dango 0.1.0 → 0.2.2

data/lib/dango/shared/memory_store.rb

@@ -31,7 +31,8 @@ module DangoFrameworkModule
         raise(DangoFrameworkError, "Shared key is not exist.")
       end
       @mutex[key].synchronize do
-        data = yield(@data[key].deep_dup)
+#        data = yield(@data[key].deep_dup)
+        data = yield(@data[key])
         @data[key] = data.deep_dup
       end
     end

data/lib/dango/tasks/dango_rake.rb

@@ -2,73 +2,202 @@
 ENV['RAILS_ENV'] = ENV['RAILS_ENV'] || 'development'
 
 require "pp"
+require "timeout"
 
-namespace :dango do
-  desc "initialize dango"
-  task :initialize do
-    puts "complete initialize."
-  end
 
-  desc "make swf"
-  task :make_swf do
-    puts "complete make_swf."
-  end
+# verboseモードのフラグを立てる処理
+def check_verbose_mode()
+  $is_verbose = (ENV["verbose"] == "true" || ENV["verbose"] == "on") ? true : false
+end
 
-  desc "check dango process"
-  task :check_dango_process do
-    # pidのチェック
+# pid保存ファイルの読み出し
+def get_dango_pid()
+  begin
     pid = open("tmp/pids/dango.pid", "rb"){|fh| fh.read }.to_i
-    puts "pid=#{pid}"
+  rescue
+    pid = nil
+  end
+  puts "pid=#{pid.inspect}" if $is_verbose
+  pid
+end
+
+# pidのプロセスがあるかどうかのチェック
+def check_exist_dango_process(pid)
+  puts "check_exist_dango_process(pid=#{pid})" if $is_verbose
+  
+  # そのpidのプロセスがあるかのチェック
+  is_pid_exist = nil
+  
+  if RUBY_PLATFORM == 'i386-mswin32'
+    # WbemからProcessIDを取得
+    require "win32ole"
+    begin
+      n_locator = WIN32OLE.new("WbemScripting.SWbemLocator.1")
+      n_service = n_locator.ConnectServer
+    rescue
+      puts "failed connect to Wbem:#{$!.inspect}" if $is_verbose
+      return
+    end
     
-    # そのpidのプロセスがあるかのチェック
-    is_pid_exist = nil
-    if RUBY_PLATFORM == 'i386-mswin32'
-      # WbemからProcessIDを取得
-      require "win32ole"
-      begin
-        n_locator = WIN32OLE.new("WbemScripting.SWbemLocator.1")
-        n_service = n_locator.ConnectServer
-      rescue
-        puts "failed connect to Wbem:#{$!.inspect}"
-        return
+    set = n_service.ExecQuery("select Caption, ProcessID from Win32_Process where ProcessID = #{pid}")
+    set.each do |one|
+#      puts(sprintf("Win32_Process %8d %s", one.ProcessID, one.Caption))
+      if one.ProcessID == pid
+        is_pid_exist = true
       end
+    end
+    
+  else ## i386-mswin32以外
+    is_pid_exist = FileTest.exist?("/proc/#{pid}")
+  end
+  
+  if is_pid_exist
+    puts "dango_process is exist." if $is_verbose
+  else
+    puts "dango_process is not exist." if $is_verbose
+  end
+  
+  is_pid_exist
+end
+
+# プロセス停止
+def stop_process(pid)
+  puts "stop process (pid=#{pid})" if $is_verbose
+  
+  if RUBY_PLATFORM == 'i386-mswin32'
+    # WbemからProcessIDを取得
+    require "win32ole"
+    begin
+      n_locator = WIN32OLE.new("WbemScripting.SWbemLocator.1")
+      n_service = n_locator.ConnectServer
+    rescue
+      puts "failed connect to Wbem:#{$!.inspect}" if $is_verbose
+      return
+    end
+    
+    set = n_service.ExecQuery("select Caption, name, ProcessID from Win32_Process where ProcessID = '#{pid}'")
+    set.each do |process|
+      puts "stopping #{process.Caption} #{process.name} #{process.ProcessID}" if $is_verbose
+      process.Terminate 0
+    end
+    
+  else ## i386-mswin32以外
+    system("kill -9 #{pid}")
+  end
+end
+
+# サーバーへの通信を使ったチェック
+def check_dango_connect()
+  require 'dango/tester/dango_tester_client'
+  
+  # コンフィグから check_dango_process_cmd を取得
+  config = YAML.load(open("dango/config/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
+  
+  serv_info = {}
+  serv_info["host"] = config['network']['host'] || 'localhost'
+  serv_info["port"] = config['network']['port'] || 15000
+#  pp serv_info
+  
+  tester = DangoTesterClient.new # 開始
+  
+  begin
+    tester1 = nil
+    sid = nil
+    timeout(8) do
+      tester1 = tester.new_client("tester1", serv_info) # テスター１
       
-      set = n_service.ExecQuery("select Caption, ProcessID from Win32_Process")
-      set.each do |one|
-#        puts(sprintf("Win32_Process %8d %s", one.ProcessID, one.Caption))
-        if one.ProcessID == pid
-          is_pid_exist = true
-        end
+      sleep 3
+      loop do
+        sid = tester1.sid
+        break if sid
+        sleep 1
       end
-    else
-      is_pid_exist = FileTest.exist?("/proc/#{pid}")
     end
+  rescue TimeoutError
+    sid = nil
+  ensure
+    tester1.dango_client_close if tester1.respond_to?(:dango_client_close)
+    tester1 = nil
+    tester.gc_thread_stop
+  end
+  
+  puts "sid=#{sid.inspect}" if $is_verbose
+  
+  if sid
+    is_alive_server = true
+  else
+    is_alive_server = false
+  end
+  
+  is_alive_server
+end
+
+
+namespace :dango do
+#  desc "make swf"
+#  task :make_swf do
+#    puts "complete make_swf." if $is_verbose
+#  end
+
+  desc "stop dango process"
+  task :stop_dango_process do
+    check_verbose_mode() # verboseモードのフラグを立てる処理
+    
+    pid = get_dango_pid()
+    stop_process(pid) if pid # pidがあればプロセス停止
+    puts "complete stop dango process." if $is_verbose
+  end
+
+  desc "check dango process"
+  task :check_dango_process do
+    check_verbose_mode() # verboseモードのフラグを立てる処理
     
-    puts "is_pid_exist=#{is_pid_exist}"
+    pid = get_dango_pid()                                    # pidのチェック
+    is_pid_exist = check_exist_dango_process(pid)            # pidのプロセスがあるかどうかのチェック
+    is_alive_server = check_dango_connect() if is_pid_exist  # サーバーへの通信を使ったチェック
     
     # コンフィグから check_dango_process_cmd を取得
     config = YAML.load(open("dango/config/#{ENV['RAILS_ENV']}.yml", "rb"){|fh| fh.read})
     check_dango_process_cmd = config['server']['check_dango_process_cmd'] || nil
     
     # is_pid_existがないならcheck_dango_process_cmd実行
-    if ! is_pid_exist && check_dango_process_cmd
-      puts "check_dango_process_cmd=#{check_dango_process_cmd}"
-      system(check_dango_process_cmd)
+    if check_dango_process_cmd && (! is_alive_server) 
+      stop_process(pid) if pid # pidがあればプロセス停止
     end
     
-    check_dango_process_cmd
+    if check_dango_process_cmd && ((! is_pid_exist) || (! is_alive_server)) 
+      puts "check_dango_process_cmd=#{check_dango_process_cmd}" if $is_verbose
+      system(check_dango_process_cmd)
+    end
     
-    puts "complete check_dango_process."
+    puts "complete check_dango_process." if $is_verbose
   end
 
   namespace :monitor do
     desc "get server info"
     task :get_server_info do
-      puts "get server info"
+      check_verbose_mode() # verboseモードのフラグを立てる処理
+      
+      puts "server_reload"
+      require 'dango/monitor/dango_monitor_client.rb'
+      begin
+        dm = DangoMonitorClient.new()
+        pp dm.get_server_info()
+        dm.dango_client_close
+        puts "complete get_server_info."
+      rescue
+        pp $!.class
+        pp $!.message
+        pp $!.backtrace
+        puts "failed get_server_info."
+      end
+      
     end
     
     desc "server_reload" # サーバーのリロード処理
     task :server_reload do
+      check_verbose_mode() # verboseモードのフラグを立てる処理
+      
       puts "server_reload"
       require 'dango/monitor/dango_monitor_client.rb'
       begin
@@ -86,7 +215,9 @@ namespace :dango do
     
     desc "send_system_message" # システムメッセージ配信
     task :send_system_message do
-      puts "send_system_message"
+      check_verbose_mode() # verboseモードのフラグを立てる処理
+      
+      puts "send_system_message" if $is_verbose
       message_type = ENV["TYPE"]
       if ! message_type
         puts "please type. ex. rake dango:monitor:send_system_message TYPE=down_1min"

data/lib/dango/tester/dango_tester_client.rb

@@ -14,7 +14,9 @@ class DangoTesterClient
   GCIntervalSec = 5.0                 # GCの発生タイミング
 
   # テスターのイニシャライズ
-  def initialize
+  def initialize(debug = false)
+    @debug = debug
+    
     @client_conns = {}
     Thread.abort_on_exception = true
     
@@ -32,7 +34,7 @@ class DangoTesterClient
         "port"=>serv_info["port"],
       }, 
     }
-    env = "development"
+    env = ENV['RAILS_ENV'] || 'development'
     
     # 接続
     client_conn = nil
@@ -43,7 +45,7 @@ class DangoTesterClient
       rescue
         client_conn = nil
         raise("connection error for retry times over.") if i == ConnectionRetryTimes - 1
-        puts "connection failed. sleep #{ConnectionRetryIntervalSec}"
+        puts "connection failed. sleep #{ConnectionRetryIntervalSec}" if @debug
         sleep ConnectionRetryIntervalSec
       end
     end
@@ -74,7 +76,7 @@ class DangoTesterClient
   
   # GCスレッドの開始
   def gc_thread_start
-    th = Thread.start do
+    gc_thread = Thread.start do
       loop do
         begin
           sleep @gc_interval_sec
@@ -83,21 +85,28 @@ class DangoTesterClient
           GC.enable
           GC.start 
           GC.disable
-          puts "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}"
+          puts "GC #{Time.now - gc_start_time}sec #{Time.now_to_s}" if @debug
           
         rescue
           puts "Exception gc_thread_start #{Time.now_to_s} #{error_message($!, 'u')}"
         end
       end
     end
-    th.priority = -1
+    gc_thread.priority = -1
+    
+    @gc_thread = gc_thread
+  end
+  
+  # GCスレッドの終了
+  def gc_thread_stop
+    @gc_thread.kill
   end
   
 end
 
 # テスト接続用のクラス
 class TestClient < DangoClientFramework
-  SendReceiveSleepIntervalSec = 0.03    # データ送信後の順の際のタイムアウトチェック間隔秒
+  SendReceiveSleepIntervalSec = 0.1      # データ送信後の順の際のタイムアウトチェック間隔秒
   ReceiveWaitTimeoutSec = 10             # データ受信確認の待ち秒数
   ReceiveTrapTimeoutSec = 0              # データ受信確認のトラップの秒数
   
@@ -107,13 +116,15 @@ class TestClient < DangoClientFramework
     
     super(env, config)
     
-    @receive_mutex = Mutex.new # 送受信用の排他処理
-    @receive_arr = []
-    @trap_thread_hash = {}
+    send_receive_shared_init()
     
-    @receive_methods = []
+#    @receive_mutex = Mutex.new # 受信用の排他処理
+#    @receive_arr = []
+#    @trap_thread_hash = {}
+#    @receive_methods = []
+    
+    send_receive_shared[:receive_cache] = [] # 受信データ用のキャッシュ初期化
     
-    send_receive_shared_init()
   end
   
   attr_accessor(:client_name)
@@ -137,10 +148,33 @@ class TestClient < DangoClientFramework
   
   # テストサーバー
   def send(name, send_obj = {})
-    logger.debug("tester.send:send_obj=#{send_obj.inspect} ")
+    logger.debug("tester.send:name=#{name}:send_obj=#{send_obj.inspect} ")
     send_action(name, send_obj)
   end
   
+  # データ受信時の処理をするためにmethod_missingを定義
+  def method_missing(name, *args)
+    if name.to_s =~ /^dango_receive_/ && args.length == 1
+      ret_obj = args[0]
+      logger.debug "ret_obj:#{name}:" + ret_obj.inspect + " " + Time.now_to_s
+      send_receive_shared.transaction(:receive_cache) do |receive_cache|
+        receive_cache.push([name, ret_obj, Time.now])
+        receive_cache
+      end
+      
+    else
+      logger.info "method not found. #{name.inspect} #{args.inspect}"
+      raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
+    end
+  end
+  
+  # send_receive_shared[:receive_cache]の中身を返すメソッド
+  def get_receive_cache
+    send_receive_shared[:receive_cache]
+  end
+  
+  
+=begin
   # trap_receive
   def trap_receive(notice_name, options = {})
     logger.debug "trap_receive_data:#{notice_name}:"
@@ -231,6 +265,7 @@ class TestClient < DangoClientFramework
       logger.debug "trap_receive_data:already register trap:notice_name:#{notice_name} "
     end
     
+    logger.debug "trap_receive_data:registered:#{notice_name}:"
   end
   
   # cancel trap_receive
@@ -255,8 +290,51 @@ class TestClient < DangoClientFramework
       @receive_arr.delete_if{|r| r[0] == notice_name}
     end
   end
+=end
   
   # wait_receive
+  def wait_receive(notice_name, options = {})
+    logger.debug "wait_receive_data:#{notice_name}:"
+    timeout = options[:timeout] || ReceiveWaitTimeoutSec
+    
+    # データ受信待ち
+    receive_data = nil
+    receive_idx = nil
+    
+    end_reserved_time = Time.now + timeout # 0以上ならタイムアウト時間決定
+    
+    loop do
+      logger.debug "wait_receive_data:loop:#{send_receive_shared[:receive_cache].inspect}"
+      
+      send_receive_shared[:receive_cache].each_with_index do |rec_data, i|
+        if rec_data[0].to_s == "dango_receive_" + notice_name.to_s
+          receive_data = rec_data.deep_dup
+          receive_idx = i
+          break
+        end
+      end
+      
+      break if receive_data != nil
+      break if end_reserved_time < Time.now
+      
+      sleep SendReceiveSleepIntervalSec # スリープ
+    end
+    
+    # タイムアウトなら
+    if receive_data == nil
+      raise(DangoFrameworkTimeoutError, "timeout:timeout_sec=#{timeout}: \n client_name=#{@client_name}(#{self.sid}) \n :notice_name=#{notice_name} \n") 
+    end
+    
+    # 結果を削除しておく
+    send_receive_shared.transaction(:receive_cache) do |receive_cache|
+      receive_cache.delete_at(receive_idx)
+      receive_cache
+    end
+    
+    receive_data[1]
+  end
+  
+=begin
   def wait_receive(notice_name, options = {})
     logger.debug "wait_receive_data:#{notice_name}:"
     timeout = options[:timeout] || ReceiveWaitTimeoutSec
@@ -300,6 +378,7 @@ class TestClient < DangoClientFramework
     end
     receive_arr
   end
+=end
   
 end