dango 0.3.9 → 0.4.0

data/LICENSE

@@ -1,16 +1,21 @@
-Copyright (C) 2007 Keisuke Minami
+Copyright (C) 2007-2008 Keisuke Minami
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

data/lib/dango/dango_g_server.rb

@@ -0,0 +1,293 @@
+#!ruby -Ku
+
+=begin
+= GServerを使うために継承
+=end
+
+
+#
+# Copyright (C) 2001 John W. Small All Rights Reserved
+#
+# Author::        John W. Small
+# Documentation:: Gavin Sinclair
+# Licence::       Freeware.
+#
+# See the class GServer for documentation.
+#
+
+require "socket"
+require "thread"
+
+#
+# GServer implements a generic server, featuring thread pool management,
+# simple logging, and multi-server management.  See HttpServer in 
+# <tt>xmlrpc/httpserver.rb</tt> in the Ruby standard library for an example of
+# GServer in action.
+#
+# Any kind of application-level server can be implemented using this class.
+# It accepts multiple simultaneous connections from clients, up to an optional
+# maximum number.  Several _services_ (i.e. one service per TCP port) can be
+# run simultaneously, and stopped at any time through the class method
+# <tt>GServer.stop(port)</tt>.  All the threading issues are handled, saving
+# you the effort.  All events are optionally logged, but you can provide your
+# own event handlers if you wish.
+#
+# === Example
+#
+# Using GServer is simple.  Below we implement a simple time server, run it,
+# query it, and shut it down.  Try this code in +irb+:
+#
+#   require 'gserver'
+#
+#   #
+#   # A server that returns the time in seconds since 1970.
+#   # 
+#   class TimeServer < GServer
+#     def initialize(port=10001, *args)
+#       super(port, *args)
+#     end
+#     def serve(io)
+#       io.puts(Time.now.to_i)
+#     end
+#   end
+#
+#   # Run the server with logging enabled (it's a separate thread).
+#   server = TimeServer.new
+#   server.audit = true                  # Turn logging on.
+#   server.start 
+#
+#   # *** Now point your browser to http://localhost:10001 to see it working ***
+#
+#   # See if it's still running. 
+#   GServer.in_service?(10001)           # -> true
+#   server.stopped?                      # -> false
+#
+#   # Shut the server down gracefully.
+#   server.shutdown
+#   
+#   # Alternatively, stop it immediately.
+#   GServer.stop(10001)
+#   # or, of course, "server.stop".
+#
+# All the business of accepting connections and exception handling is taken
+# care of.  All we have to do is implement the method that actually serves the
+# client.
+#
+# === Advanced
+#
+# As the example above shows, the way to use GServer is to subclass it to
+# create a specific server, overriding the +serve+ method.  You can override
+# other methods as well if you wish, perhaps to collect statistics, or emit
+# more detailed logging.
+#
+#   connecting
+#   disconnecting
+#   starting
+#   stopping
+#
+# The above methods are only called if auditing is enabled.
+#
+# You can also override +log+ and +error+ if, for example, you wish to use a
+# more sophisticated logging system.
+#
+class GServer
+
+  DEFAULT_HOST = "127.0.0.1"
+
+  def serve(io)
+  end
+
+  @@services = {}   # Hash of opened ports, i.e. services
+  @@servicesMutex = Mutex.new
+
+  def GServer.stop(port, host = DEFAULT_HOST)
+    @@servicesMutex.synchronize {
+      @@services[host][port].stop
+    }
+  end
+
+  def GServer.in_service?(port, host = DEFAULT_HOST)
+    @@services.has_key?(host) and
+      @@services[host].has_key?(port)
+  end
+
+  def stop
+    @connectionsMutex.synchronize  {
+      if @tcpServerThread
+        @tcpServerThread.raise "stop"
+      end
+    }
+  end
+
+  def stopped?
+    @tcpServerThread == nil
+  end
+
+  def shutdown
+    @shutdown = true
+  end
+
+  def connections
+    @connections.size
+  end
+
+  def join
+    @tcpServerThread.join if @tcpServerThread
+  end
+
+  attr_reader :port, :host, :maxConnections
+  attr_accessor :stdlog, :audit, :debug
+
+  def connecting(client)
+    addr = client.peeraddr
+    log("#{self.class.to_s} #{@host}:#{@port} client:#{addr[1]} " +
+        "#{addr[2]}<#{addr[3]}> connect")
+    true
+  end
+
+  def disconnecting(clientPort)
+    log("#{self.class.to_s} #{@host}:#{@port} " +
+      "client:#{clientPort} disconnect")
+  end
+
+  protected :connecting, :disconnecting
+
+  def starting()
+    log("#{self.class.to_s} #{@host}:#{@port} start")
+  end
+
+  def stopping()
+    log("#{self.class.to_s} #{@host}:#{@port} stop")
+  end
+
+  protected :starting, :stopping
+
+  def error(detail)
+    log(detail.backtrace.join("\n"))
+  end
+
+  def log(msg)
+    if @stdlog
+      @stdlog.puts("[#{Time.new.ctime}] %s" % msg)
+      @stdlog.flush
+    end
+  end
+
+  protected :error, :log
+
+  def initialize(port, host = DEFAULT_HOST, maxConnections = 4,
+    stdlog = $stderr, audit = false, debug = false)
+    @tcpServerThread = nil
+    @port = port
+    @host = host
+    @maxConnections = maxConnections
+    @connections = []
+    @connectionsMutex = Mutex.new
+    @connectionsCV = ConditionVariable.new
+    @stdlog = stdlog
+    @audit = audit
+    @debug = debug
+  end
+
+  def start(maxConnections = -1, backlog = nil) # この部分を改造
+    raise "running" if !stopped?
+    @shutdown = false
+    @maxConnections = maxConnections if maxConnections > 0
+    @@servicesMutex.synchronize  {
+      if GServer.in_service?(@port,@host)
+        raise "Port already in use: #{host}:#{@port}!"
+      end
+      @tcpServer = TCPServer.new(@host,@port)
+      @tcpServer.listen(backlog) if backlog # この部分を改造
+      @port = @tcpServer.addr[1]
+      @@services[@host] = {} unless @@services.has_key?(@host)
+      @@services[@host][@port] = self;
+    }
+    @tcpServerThread = Thread.new {
+      begin
+        starting if @audit
+        while !@shutdown
+          @connectionsMutex.synchronize  {
+             while @connections.size >= @maxConnections
+               @connectionsCV.wait(@connectionsMutex)
+             end
+          }
+          client = @tcpServer.accept
+          @connections << Thread.new(client)  { |myClient|
+            begin
+              myPort = myClient.peeraddr[1]
+              serve(myClient) if !@audit or connecting(myClient)
+            rescue => detail
+              error(detail) if @debug
+            ensure
+              begin
+                myClient.close
+              rescue
+              end
+              @connectionsMutex.synchronize {
+                @connections.delete(Thread.current)
+                @connectionsCV.signal
+              }
+              disconnecting(myPort) if @audit
+            end
+          }
+        end
+      rescue => detail
+        error(detail) if @debug
+      ensure
+        begin
+          @tcpServer.close
+        rescue
+        end
+        if @shutdown
+          @connectionsMutex.synchronize  {
+             while @connections.size > 0
+               @connectionsCV.wait(@connectionsMutex)
+             end
+          }
+        else
+          @connections.each { |c| c.raise "stop" }
+        end
+        @tcpServerThread = nil
+        @@servicesMutex.synchronize  {
+          @@services[@host].delete(@port)
+        }
+        stopping if @audit
+      end
+    }
+    self
+  end
+
+end
+
+
+#require "gserver"
+class DangoGServer < GServer
+  def initialize(parent, *args)
+    @parent = parent
+    super(*args)
+  end
+  
+  def serve(sock)
+    @parent.thread_main(sock)
+  end
+  
+  def connecting(sock)
+    @parent.connecting(sock)
+  end
+  
+  def disconnecting(sock)
+    @parent.disconnecting(sock)
+  end
+  
+  def starting()
+    log("#{self.class.to_s} #{@host}:#{@port} start")
+    @parent.starting()
+  end
+  
+  def stopping()
+    log("#{self.class.to_s} #{@host}:#{@port} stop")
+    @parent.stopping()
+  end
+end
+

data/lib/dango/server_framework.rb

@@ -4,7 +4,6 @@
 = コネクション型サーバーフレームワーク
 =end
 
-require 'gserver'
 require 'digest/md5'
 
 require "dango/framework_base"
@@ -16,6 +15,8 @@ require "dango/monitor/server_monitor_action"
 
 # フレームワーククラス
 class DangoServerFramework
+  require "dango/dango_g_server"
+  
   include DangoFrameworkModule
   
   RAILS_ENV = ENV['RAILS_ENV'] || 'development'
@@ -47,35 +48,6 @@ class DangoServerFramework
   
   MainLoopWaitSec = 3.0               # メインループの待ち時間（サーバー内ファイルのチェック時間）
   
-  class DangoGServer < GServer
-    def initialize(parent, *args)
-      @parent = parent
-      super(*args)
-    end
-    
-    def serve(sock)
-      @parent.thread_main(sock)
-    end
-    
-    def connecting(sock)
-      @parent.connecting(sock)
-    end
-    
-    def disconnecting(sock)
-      @parent.disconnecting(sock)
-    end
-    
-    def starting()
-      log("#{self.class.to_s} #{@host}:#{@port} start")
-      @parent.starting()
-    end
-    
-    def stopping()
-      log("#{self.class.to_s} #{@host}:#{@port} stop")
-      @parent.stopping()
-    end
-  end
-  
   def stop_gserver() # gserverの停止
     if @gserver && !@gserver.stopped?
       # 強制的に接続しているsocketをクローズ
@@ -90,10 +62,6 @@ class DangoServerFramework
       # サーバーを停止
       @gserver.shutdown
       @gserver.stop
-#      while(!@gserver.stopped?) do
-#        sleep ServerStopWait
-#        debug_print("waiting... #{@gserver.stopped?} #{@gserver.connections}")
-#      end
       10.times do
         break if @gserver.stopped?
         sleep ServerStopWait
@@ -209,7 +177,8 @@ class DangoServerFramework
       GC.disable
       open(@pid_file, "wb"){|fh| fh.write Process.pid.to_s } # pidをファイルに保存
       
-      @gserver.start
+#      @gserver.start(@server_max_connections)
+      @gserver.start(@server_max_connections, 20) # backlogを20に設定
       
     rescue Exception
       error_print("#{error_message($!, 'u')}")
@@ -341,14 +310,15 @@ class DangoServerFramework
         end
         
         if is_flash_policy_file # Flashのポリシーファイルが来たら
-          logger.info "is_flash_policy_file"
+          logger.debug "is_flash_policy_file"
           
           if @policy_file_request # ポリシーファイルを返す設定なら
             logger.info "is_flash_policy_file #{sid} #{@policy_file_request}"
 
             allow_str = ""
+            
             @policy_file_allow_domain.each do |one_host|
-              allow_str += %Q|<allow-access-from domain="#{one_host}" to-ports="#{@network_port}" />|
+              allow_str += %Q|<allow-access-from domain="#{one_host}" to-ports="#{@policy_file_allow_port.join(',')}" />|
               allow_str += "\n"
             end
 
@@ -504,11 +474,9 @@ EOF
   
   # 各種サーバー仕様の変数設定
   def set_server_variables() 
-    # debug
-    @server_debug = @config['server']['debug'] || false
-    Thread.abort_on_exception = true if @server_debug
-    
     # 変数の初期設定
+    @server_debug                      = @config['server']['debug'] || true
+    
     @network_port                      = @config['network']['port'] || DefaultNetworkPort
     @network_host                      = @config['network']['host'] || DefaultNetworkHost
     @server_host                       = @config['server']['host'] || DefaultServerHost
@@ -533,6 +501,9 @@ EOF
     @policy_file_allow_domain          = @config['server']['policy_file_allow_domain']
     @policy_file_allow_domain          = [@network_host] if @policy_file_allow_domain.class != Array
     
+    @policy_file_allow_port            = @config['server']['policy_file_allow_port']
+    @policy_file_allow_port            = [@network_port] if !@policy_file_allow_port
+    
     @safe_resolver                     = @config['server']['safe_resolver'] || false # require 'resolv-replace'するかどうか
     
     @statistics_process_memory         = @config['server']['statistics_process_memory'] || false # プロセスのメモリ使用量統計を取る
@@ -558,6 +529,9 @@ EOF
       @log_level_str = str if const == @log_level
     end
     
+    # スレッド終了時に全体停止する
+    Thread.abort_on_exception = true if @server_debug
+    
     # 統計用情報の初期化
     @start_time = Time.now # サーバー起動時間
     @recv_count = 0        # 受信回数
@@ -790,6 +764,8 @@ EOF
   def thread_send_notice_queue()
     loop do
       begin
+        before_time = Time.now
+        
         send_data_list = []
         
         pop_data = @queue_send_notice.pop
@@ -839,6 +815,11 @@ EOF
           end
         end
         
+        send_sec = Time.now - before_time
+        if send_sec > @send_receive_sleep_interval_sec
+          logger.debug "thread_send_notice_queue:send_sec=#{send_sec}sec" 
+        end
+        
         sleep @send_receive_sleep_interval_sec # スリープ
         
       rescue Exception

data/lib/dango/version.rb

@@ -1,8 +1,8 @@
 module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 3
-    TINY  = 9
+    MINOR = 4
+    TINY  = 0
 
     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.9
+  version: 0.4.0
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 00:00:00 +09:00
+date: 2008-09-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/dango/mutex_socket_list.rb
 - lib/dango/socket_list.rb
 - lib/dango/session_manager.rb
+- lib/dango/dango_g_server.rb
 - lib/dango/controller_plugin/dango_controller_plugin.rb
 - lib/dango/monitor/dango_monitor_client.rb
 - lib/dango/monitor/server_monitor_action.rb