dango 0.3.2 → 0.3.3

data/lib/dango/client_framework.rb

@@ -4,6 +4,7 @@
 = コネクション型クライアントフレームワーク
 =end
 
+require 'dango/version'
 require "dango/framework_base"
 
 # フレームワーククラス

data/lib/dango/controller_plugin/dango_controller_plugin.rb

@@ -0,0 +1,28 @@
+#!ruby -Ku
+
+=begin
+= Dangoサーバーのメンテナンス用モニタ
+=end
+
+
+# モニター用のdangoクライアントクラス
+module DangoControllerPlugin
+  def self.dango_server_config(options = {})
+    if !options[:env]
+      options[:env] = ENV['RAILS_ENV'] 
+    end
+    config = YAML.load(open("#{RAILS_ROOT}/config/dango/#{options[:env]}.yml", "rb"){|fh| fh.read})
+    config
+  end
+
+  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_obj = DRbObject.new_with_uri(drb_uri)
+    drb_obj.__send__(method_name.to_s, arg)
+  end
+end
+
+
+

data/lib/dango/framework_base.rb

@@ -5,7 +5,6 @@
 =end
 
 
-require 'resolv-replace' # 名前解決時のロックがかかってしまう件を解決できるはず
 require 'socket'
 require 'logger'
 require 'thread'

data/lib/dango/monitor/dango_monitor_client.rb

@@ -4,9 +4,6 @@
 = Dangoサーバーのメンテナンス用モニタ
 =end
 
-#$LOAD_PATH.push("../../../../svn/rubyforge/dango/lib")
-
-#gem "dango"
 
 require 'dango/client_framework' # コネクションサーバーフレームワークの呼び出し
 

data/lib/dango/monitor/server_monitor_action.rb

@@ -52,7 +52,7 @@ class ServerMonitorAction
   # メンテナンスコマンド：エラーの場合
   def dango_check_monitor_error(sock, action_name)
     peerhost, peeraddr = sock.peeraddr[2, 2]
-    backdoor_host = @config['server']['backdoor_host']
+    backdoor_host = @backdoor_host
     logger.debug "dango_check_monitor_error:peerhost=#{peerhost.inspect} peeraddr=#{peeraddr.inspect} backdoor_host=#{backdoor_host.inspect}"
     
     match = false

data/lib/dango/server_framework.rb

@@ -164,6 +164,8 @@ class DangoServerFramework
     begin
       set_server_variables()                # 各種サーバー仕様の変数設定
       
+      require 'resolv-replace' if @safe_resolver # 名前解決時のロックがかかってしまう件を解決できるはず
+      
       logger.warn("===== server initialize =====") # loggerの準備
       logger.warn("network_port=#{@network_port}")
       logger.warn("network_host=#{@network_host}")
@@ -189,11 +191,17 @@ class DangoServerFramework
       
       TCPSocket.do_not_reverse_lookup = true # 逆引きを行わない
 #     TCPSocket.do_not_reverse_lookup = false # 逆引きを行う
-    
+      
+      if @backdoor_run_drb_server # backdoor用のdrbを起動
+        uri = "druby://#{@network_host}:#{@backdoor_run_drb_port}"
+        DRb.start_service(uri, self)
+        logger.warn("start drb server: uri=#{DRb.uri}")
+      end
+      
       @gserver = DangoGServer.new(self, @network_port, @server_host, @server_max_connections)
       @gserver.audit = true                 # Turn logging on.
       @gserver.debug = true                 # debug
-    
+      
       gserver_log_fh = open(@gserver_log_file, "a")
       @gserver.stdlog = gserver_log_fh
       
@@ -519,9 +527,15 @@ EOF
     
     @policy_file_allow_domain          = @config['server']['policy_file_allow_domain']
     @policy_file_allow_domain          = [@network_host] if @policy_file_allow_domain.class != Array
-
+    
+    @safe_resolver                     = @config['server']['safe_resolver'] || false # require 'resolv-replace'するかどうか
+    
     @statistics_process_memory         = @config['server']['statistics_process_memory'] || false # プロセスのメモリ使用量統計を取る
-
+    
+    @backdoor_run_drb_server   = @config['server']['backdoor_run_drb_server'] || false # バックドア用のdrbサーバーを起動するかどうか
+    @backdoor_run_drb_port     = @config['server']['backdoor_run_drb_port'] || 12345   # バックドア用のdrbサーバーのポート番号
+    @backdoor_host             = @config['server']['backdoor_host'] || '127.0.0.1'     # バックドアのアクセス可能ホスト名
+    
     # ログレベルの設定
     log_level_hash = {
       "FATAL" => Logger::FATAL, 
@@ -714,7 +728,7 @@ EOF
   
   # クライアントから来たheart_beatなら
   def dango_receive__notice_heart_beat(ret_obj)
-    logger.debug "dango_receive__notice_heart_beat:#{session[:sid]}:#{ret_obj['_hb_id']} " 
+#    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

data/lib/dango/tester/dango_tester_client.rb

@@ -4,8 +4,9 @@
 = コネクション型サーバーフレームワーク
 =end
 
-require 'dango/client_framework' # コネクションクライアントフレームワークの呼び出し
 require 'thread'
+require 'pp'
+require 'dango/client_framework' # コネクションクライアントフレームワークの呼び出し
 
 # テスタークラス
 class DangoTesterClient
@@ -18,6 +19,8 @@ class DangoTesterClient
   def initialize(debug = false)
     @debug = debug
     
+    original_print("Dango Version=#{Dango::VERSION::STRING}\n") if debug
+    
     @client_conns = {}
     Thread.abort_on_exception = true
     
@@ -25,6 +28,29 @@ class DangoTesterClient
     @gc_interval_sec = GCIntervalSec
     gc_thread_start()                     # GCスレッドの開始
     
+    def self.die(str)
+      original_print "============ die ============ #{Time.now_to_s}\n"
+      original_print caller().pretty_inspect + "\n"
+      original_print str.to_s + "\n"
+      exit 1
+    end
+    
+#    def self.print(str)
+#      original_print("#{str}")
+#    end
+    
+    def self.puts(str)
+      original_print("#{str}\n")
+    end
+    
+    def self.p(obj)
+      original_print("#{obj.inspect}\n")
+    end
+    
+    def self.pp(obj)
+      original_print("#{obj.pretty_inspect}\n")
+    end
+  
   end
   
   # クライアントを１個接続
@@ -68,15 +94,21 @@ class DangoTesterClient
   
   attr_reader(:client_conns)
   
-  def die(str)
-    puts "============ die ============ #{Time.now_to_s}"
-    pp caller()
-    puts str
-    exit 1
-  end
-  
-  def self.die(str)
-    die(str)
+  def original_print(str)
+    disp_str = ""
+    if ENV['LANG'] =~ /euc/i || ENV['LANG'] =~ /ujis/i
+      disp_str = str.to_s.toeuc
+    elsif ENV['LANG'] =~ /sjis/i
+      disp_str = str.to_s.tosjis
+    elsif ENV['LANG'] =~ /UTF\-8/i
+      disp_str = str.to_s.toutf8
+    elsif RUBY_PLATFORM == 'i386-mswin32' || RUBY_PLATFORM == 'i386-cygwin'
+      disp_str = str.to_s.tosjis
+    else
+      disp_str = str.to_s
+    end
+    
+    print(disp_str)
   end
   
   # GCスレッドの開始

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-26 00:00:00 +09:00
+date: 2008-07-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: Realtime communications network framework for Ruby and Flash on Rails.
 email: keisuke@rccn.com
 executables: []
@@ -50,6 +60,7 @@ files:
 - lib/dango/mutex_socket_list.rb
 - lib/dango/socket_list.rb
 - lib/dango/session_manager.rb
+- lib/dango/controller_plugin/dango_controller_plugin.rb
 - lib/dango/monitor/dango_monitor_client.rb
 - lib/dango/monitor/server_monitor_action.rb
 - lib/dango/script/dango_server.rb