bayserver-core 3.0.2 → 3.3.1

data/lib/baykit/bayserver/bayserver.rb

@@ -28,6 +28,7 @@ require 'baykit/bayserver/protocol/protocol_handler_store'
 
 require 'baykit/bayserver/docker/package'
 require 'baykit/bayserver/common/inbound_ship_store'
+require 'baykit/bayserver/common/rudder_state_store'
 require 'baykit/bayserver/common/warp_ship_store'
 
 require 'baykit/bayserver/util/locale'
@@ -52,7 +53,6 @@ module Baykit
       include Baykit::BayServer::Agent::Signal
       include Baykit::BayServer::Agent::Monitor
       include Baykit::BayServer::Protocol
-      include Baykit::BayServer::WaterCraft
       include Baykit::BayServer::Tours
       include Baykit::BayServer::Docker
       include Baykit::BayServer::Docker::Base
@@ -249,6 +249,7 @@ module Baykit
 
           # Init stores, memory usage managers
           PacketStore.init()
+          RudderStateStore.init()
           InboundShipStore.init()
           ProtocolHandlerStore.init()
           TourStore.init(TourStore::MAX_TOURS)
@@ -281,7 +282,7 @@ module Baykit
         end
       end
 
-      def self.open_ports(anchored_port_map, unanchored_port_map)
+      def self.open_ports()
         @ports.each do |dkr|
           # open port
           adr = dkr.address()
@@ -312,8 +313,6 @@ module Baykit
 
             skt.listen(0)
 
-            #skt = port_dkr.new_server_socket skt
-            anchored_port_map[skt] = dkr
           else
             # Open UDP port
             BayLog.info(BayMessage.get(:MSG_OPENING_UDP_PORT, dkr.host, dkr.port, dkr.protocol()))
@@ -328,23 +327,20 @@ module Baykit
               BayLog.error_e(e, BayMessage.get(:INT_CANNOT_OPEN_PORT, dkr.host, dkr.port, e))
               raise e
             end
-            unanchored_port_map[skt] = dkr
+            @unanchorable_port_map[IORudder.new(skt)] = dkr
 
           end
         end
       end
 
       def self.parent_start()
-        anchored_port_map = {}
-        unanchored_port_map = {}
-
 
         if @harbor.multi_core
           if !SysUtil.run_on_windows()
-            open_ports(anchored_port_map, unanchored_port_map)
+            open_ports()
           end
         else
-          open_ports(anchored_port_map, unanchored_port_map)
+          open_ports()
 
           # Thread mode
           GrandAgent.init(
@@ -355,7 +351,7 @@ module Baykit
         end
 
         SignalAgent.init(@harbor.control_port)
-        GrandAgentMonitor.init(@harbor.grand_agents, anchored_port_map)
+        GrandAgentMonitor.init(@harbor.grand_agents)
         create_pid_file(Process.pid)
         GrandAgentMonitor.join
       end
@@ -364,11 +360,8 @@ module Baykit
 
         invoke_runners()
 
-        @anchorable_port_map = {}
-        unanchored_port_map = {}
-
         if(SysUtil.run_on_windows())
-         open_ports(@anchorable_port_map, unanchored_port_map)
+         open_ports()
         else
           @derived_port_nos.each do |no|
             # Rebuild server socket

data/lib/baykit/bayserver/common/cities.rb

@@ -1,6 +1,6 @@
 module Baykit
   module BayServer
-    module Util
+    module Common
       class Cities
 
         attr :any_city

data/lib/baykit/bayserver/common/inbound_ship.rb

@@ -166,51 +166,11 @@ module Baykit
           def send_headers(check_id, tur)
             check_ship_id(check_id)
 
-            if tur.zombie? || tur.aborted?
-              # Don't send peer any data
-              BayLog.debug("%s zombie tur", tur)
-              return
-            end
-
-            handled = false
-            if !tur.error_handling && tur.res.headers.status >= 400
-              trouble = BayServer.harbor.trouble
-              if trouble != nil
-                cmd = trouble.find(tur.res.headers.status)
-                if cmd != nil
-                  err_tour = get_error_tour
-                  err_tour.req.uri = cmd.target
-                  tur.req.headers.copy_to(err_tour.req.headers)
-                  tur.res.headers.copy_to(err_tour.res.headers)
-                  err_tour.req.remote_port = tur.req.remote_port
-                  err_tour.req.remote_address = tur.req.remote_address
-                  err_tour.req.server_address = tur.req.server_address
-                  err_tour.req.server_port = tur.req.server_port
-                  err_tour.req.server_name = tur.req.server_name
-                  err_tour.res.header_sent = tur.res.header_sent
-                  tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ZOMBIE)
-                  case cmd.method
-                  when :GUIDE
-                    err_tour.go
-                  when :TEXT
-                    @protocol_handler.send_headers(err_tour)
-                    data = cmd.target
-                    err_tour.res.send_content(Tour::TOUR_ID_NOCHECK, data, 0, data.length)
-                    err_tour.end_content(Tour::TOUR_ID_NOCHECK)
-                  when :REROUTE
-                    err_tour.res.send_http_exception(Tour::TOUR_ID_NOCHECK, HttpException.moved_temp(cmd.target))
-                  end
-                  handled = true
-                end
-              end
-            end
-            if !handled
-              @port_docker.additional_headers.each do |nv|
-                tur.res.headers.add(nv[0], nv[1])
-              end
-              BayLog.debug("%s send_res_headers", tur)
-              tour_handler.send_res_headers(tur)
+            @port_docker.additional_headers.each do |nv|
+              tur.res.headers.add(nv[0], nv[1])
             end
+            BayLog.debug("%s send_res_headers", tur)
+            tour_handler.send_res_headers(tur)
           end
 
           def send_redirect(check_id, tur, status, location)
@@ -254,7 +214,7 @@ module Baykit
                 if keep_alive
                   res_conn = tur.res.headers.get_connection()
                   keep_alive = (res_conn == Headers::CONNECTION_KEEP_ALIVE) ||
-                    (res_conn == Headers::CONNECTION_UNKOWN)
+                    (res_conn == Headers::CONNECTION_UNKNOWN)
                 end
                 if keep_alive
                   if tur.res.headers.content_length() < 0

data/lib/baykit/bayserver/common/inbound_ship_store.rb

@@ -11,7 +11,6 @@ module Baykit
   module BayServer
     module Common
         class InboundShipStore < Baykit::BayServer::Util::ObjectStore
-          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Util
           include Baykit::BayServer::Agent
 

data/lib/baykit/bayserver/common/multiplexer.rb

@@ -9,6 +9,10 @@ module Baykit
           raise NotImplementedError.new
         end
 
+        def remove_rudder_state(rd)
+          raise NotImplementedError.new
+        end
+
         def get_rudder_state(rd)
           raise NotImplementedError.new
         end
@@ -29,7 +33,7 @@ module Baykit
           raise NotImplementedError.new
         end
 
-        def req_write(rd, buf, adr, tag, lis)
+        def req_write(rd, buf, adr, tag, &lis)
           raise NotImplementedError.new
         end
 

data/lib/baykit/bayserver/{agent/multiplexer → common}/rudder_state.rb

@@ -1,16 +1,26 @@
+require 'baykit/bayserver/util/reusable'
+require 'baykit/bayserver/util/counter'
 
 module Baykit
   module BayServer
-    module Agent
-      module Multiplexer
+    module Common
         class RudderState
+          include Baykit::BayServer::Util::Reusable  # implements
+
+          include Baykit::BayServer::Util
+          class << self
+            attr :id_counter
+          end
+          @id_counter = Counter.new
+
+          attr :id
+
           attr :rudder
           attr :transporter
           attr_accessor :multiplexer
 
           attr :last_access_time
           attr_accessor :closing
-
           attr :read_buf
           attr :buf_size
           attr :write_queue
@@ -22,17 +32,19 @@ module Baykit
           attr :write_queue_lock
           attr :reading_lock
           attr :writing_lock
-          attr_accessor :closed
           attr_accessor :finale
 
           attr_accessor :accepting
           attr_accessor :connecting
 
+          def initialize
 
-          def initialize(rd, tp = nil, timeout_sec = 0)
+          end
+
+          def init(rd, tp = nil, timeout_sec = 0)
+            @id = RudderState.id_counter.next
             @rudder = rd
             @transporter = tp
-            @closed = false
             @timeout_sec = timeout_sec
 
             if tp != nil
@@ -46,7 +58,6 @@ module Baykit
 
             @accepting = false
             @connecting = false
-            @closing = false
             @write_queue = []
             @write_queue_lock = Mutex::new
             @reading_lock = Mutex::new
@@ -59,12 +70,33 @@ module Baykit
 
           def to_s
             str = "st(rd=#{@rudder} mpx=#{@multiplexer} tp=#{@transporter})"
-            if @closing
-              str += " closing";
-            end
             return str
           end
 
+          #########################################
+          # Implements Reusable
+          #########################################
+          def reset()
+            @id = 0
+            @rudder = nil
+            @transporter = nil
+            @multiplexer = nil
+
+            @last_access_time = 0
+            @closing = false
+            @read_buf.clear
+            @write_queue = []
+            @bytes_read = 0
+            @bytes_wrote = 0
+            @finale = false
+            @reading = false
+            @writing = false
+            @timeout_sec = 0
+          end
+
+          #########################################
+          # Custom methods
+          #########################################
 
           def access
             @last_access_time = Time.now.tv_sec
@@ -74,7 +106,6 @@ module Baykit
             @finale = true
           end
 
-        end
       end
     end
   end

data/lib/baykit/bayserver/common/rudder_state_store.rb

@@ -0,0 +1,63 @@
+require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
+
+require 'baykit/bayserver/common/rudder_state'
+
+require 'baykit/bayserver/util/object_store'
+require 'baykit/bayserver/util/string_util'
+
+module Baykit
+  module BayServer
+    module Common
+      class RudderStateStore  < Baykit::BayServer::Util::ObjectStore
+        include Baykit::BayServer::Util
+        include Baykit::BayServer::Agent
+        class AgentListener
+          include Baykit::BayServer::Agent::LifecycleListener # implements
+
+          def add(agt_id)
+            RudderStateStore.stores[agt_id] = RudderStateStore.new();
+          end
+
+          def remove(agt_id)
+            RudderStateStore.stores.delete(agt_id);
+          end
+        end
+
+        class << self
+          #  Agent id => InboundShipStore
+          attr :stores
+        end
+        @stores = {}
+
+
+        def initialize
+          super
+          @factory = -> { RudderState.new() }
+        end
+
+        #
+        #  print memory usage
+        #
+        def print_usage(indent)
+          BayLog.info("%sRudderStateStore Usage:", StringUtil.indent(indent))
+          super(indent+1)
+        end
+
+
+        ######################################################
+        # class methods
+        ######################################################
+        def self.init()
+          GrandAgent.add_lifecycle_listener(AgentListener.new())
+        end
+
+        def self.get_store(agent_id)
+          return @stores[agent_id]
+        end
+
+      end
+    end
+  end
+end
+

data/lib/baykit/bayserver/{agent/multiplexer → common}/transporter.rb

@@ -2,8 +2,7 @@ require 'baykit/bayserver/util/reusable'
 
 module Baykit
   module BayServer
-    module Agent
-      module Multiplexer
+    module Common
         module Transporter # interface
           include Baykit::BayServer::Util::Reusable # implements
 
@@ -11,7 +10,7 @@ module Baykit
             raise NotImplementedError.new
           end
 
-          def on_connect(rd)
+          def on_connected(rd)
             raise NotImplementedError.new
           end
 
@@ -55,7 +54,6 @@ module Baykit
             raise NotImplementedError.new
           end
         end
-      end
     end
   end
 end

data/lib/baykit/bayserver/common/warp_ship.rb

@@ -170,16 +170,20 @@ module Baykit
             end
           end
 
-          def end_warp_tour(tur)
+          def end_warp_tour(tur, keep)
             wdat = WarpData.get(tur)
-            BayLog.debug("%s end warp tour: started=%s ended=%s", tur, wdat.started, wdat.ended)
+            BayLog.debug("%s end warp tour: wtur#%d started=%s ended=%s", tur, wdat.warp_id, wdat.started, wdat.ended)
 
             if(!@tour_map.include?(wdat.warp_id))
-              raise Sink.new("%s WarpId not in tourMap: %d", tur, wdat.warp_id);
+              raise Sink.new("%s WarpId not in tourMap: wture#%d", tur, wdat.warp_id);
             else
               @tour_map.delete wdat.warp_id
             end
-            @docker.keep(self)
+
+            if keep
+              BayLog.debug("%s keep warp ship", self)
+              @docker.keep(self)
+            end
           end
 
           def notify_service_unavailable(msg)
@@ -197,7 +201,7 @@ module Baykit
             end
 
             if must
-              raise Sink.new("%s warp tours not found: id=%d", self, warp_id)
+              raise Sink.new("%s warp tour not found: id=%d", self, warp_id)
             else
               nil
             end
@@ -210,9 +214,10 @@ module Baykit
           def notify_error_to_owner_tour(status, msg)
             @lock.synchronize do
               @tour_map.keys.each do |warp_id|
+                BayLog.debug("%s wtur#%d notify error to owner", self, warp_id)
                 tur = get_tour(warp_id)
-                BayLog.debug("%s send error to owner: %s running=%s", self, tur, tur.running?)
-                if tur.running?
+                BayLog.debug("%s wtur#%d send error to owner: %s running=%s", self, warp_id, tur, tur.running?)
+                if tur.running? || tur.reading?
                   begin
                     tur.res.send_error(Tour::TOUR_ID_NOCHECK, status, msg)
                   rescue Exception => e

data/lib/baykit/bayserver/{agent/multiplexer → common}/write_unit.rb

@@ -2,8 +2,7 @@ require 'baykit/bayserver/util/reusable'
 
 module Baykit
   module BayServer
-    module Agent
-      module Multiplexer
+    module Common
         class WriteUnit
 
           attr :buf
@@ -11,7 +10,7 @@ module Baykit
           attr :tag
           attr :listener
 
-          def initialize(buf, adr, tag, lis)
+          def initialize(buf, adr, tag, &lis)
             @buf = buf
             @adr = adr
             @tag = tag
@@ -24,7 +23,6 @@ module Baykit
             end
           end
         end
-      end
     end
   end
 end

data/lib/baykit/bayserver/docker/base/inbound_data_listener.rb

@@ -1,5 +1,4 @@
 require 'baykit/bayserver/agent/next_socket_action'
-require 'baykit/bayserver/agent/transporter/data_listener'
 require 'baykit/bayserver/ships/ship'
 require 'baykit/bayserver/tours/package'
 

data/lib/baykit/bayserver/docker/base/port_base.rb

@@ -1,6 +1,5 @@
 require 'baykit/bayserver/protocol/protocol_handler_store'
 require 'baykit/bayserver/bcf/package'
-require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 require 'baykit/bayserver/rudders/io_rudder'
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/util/object_factory'
@@ -8,6 +7,7 @@ require 'baykit/bayserver/util/object_factory'
 require 'baykit/bayserver/docker/port'
 require 'baykit/bayserver/docker/base/docker_base'
 require 'baykit/bayserver/common/inbound_ship_store'
+require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 
 module Baykit
   module BayServer
@@ -21,7 +21,6 @@ module Baykit
           include Baykit::BayServer::Agent::Multiplexer
           include Baykit::BayServer::Docker
           include Baykit::BayServer::Docker::Base
-          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Protocol
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Util
@@ -152,8 +151,8 @@ module Baykit
                 raise ConfigException.new(kv.file_name, kv.line_no, BayMessage.get(:CFG_INVALID_PARAMETER_VALUE, kv.value))
               end
 
-              name = kv.value[0 .. idx].strip()
-              value = kv.value[idx+1 .. -1].strip()
+              name  = kv.value[0, idx].strip
+              value = kv.value[idx+1, kv.value.length].strip
               @additional_headers << [name, value]
 
             else
@@ -218,7 +217,8 @@ module Baykit
             proto_hnd = PortBase.get_protocol_handler_store(protocol(), agt_id).rent()
             sip.init_inbound(rd, agt_id, tp, self, proto_hnd)
 
-            st = RudderState.new(rd, tp)
+            st = RudderStateStore.get_store(agt_id).rent()
+            st.init(rd, tp)
             agt.net_multiplexer.add_rudder_state(rd, st)
             agt.net_multiplexer.req_read(rd)
           end

data/lib/baykit/bayserver/docker/base/warp_base.rb

@@ -2,11 +2,11 @@ require 'uri'
 
 require 'baykit/bayserver/agent/grand_agent'
 require 'baykit/bayserver/agent/lifecycle_listener'
-require 'baykit/bayserver/agent/multiplexer/rudder_state'
 require 'baykit/bayserver/docker/warp'
 require 'baykit/bayserver/docker/base/club_base'
 require 'baykit/bayserver/common/warp_data'
 require 'baykit/bayserver/common/warp_ship_store'
+require 'baykit/bayserver/common/rudder_state'
 
 module Baykit
   module BayServer
@@ -20,6 +20,7 @@ module Baykit
           include Baykit::BayServer::Protocol
           include Baykit::BayServer::Util
           include Baykit::BayServer::Rudders
+          include Baykit::BayServer::Common
 
           class AgentListener
             include Baykit::BayServer::Agent::LifecycleListener # implements
@@ -214,13 +215,15 @@ module Baykit
               wsip.start_warp_tour(tur)
 
               if need_connect
-                agt.net_multiplexer.add_rudder_state(wsip.rudder, RudderState.new(wsip.rudder, tp))
+                st = RudderStateStore.get_store(agt.agent_id).rent()
+                st.init(wsip.rudder, tp)
+                agt.net_multiplexer.add_rudder_state(wsip.rudder, st)
                 agt.net_multiplexer.get_transporter(wsip.rudder).req_connect(wsip.rudder, @host_addr[1])
               end
 
             rescue SystemCallError => e
-              wsip.end_warp_tour(tur)
-              raise e
+              BayLog.error_e(e, "%s Error on starting warp tour", wsip)
+              raise HttpException.new(HttpStatus::INTERNAL_SERVER_ERROR, "%s", e)
             rescue HttpException => e
               raise e
             end

data/lib/baykit/bayserver/docker/built_in/built_in_city_docker.rb

@@ -155,7 +155,7 @@ module Baykit
             @log_list.each do |dkr|
               begin
                 dkr.log(tur)
-              rescue => e
+              rescue IOError => e
                 BayLog.error_e(e)
               end
             end

data/lib/baykit/bayserver/docker/built_in/built_in_harbor_docker.rb

@@ -40,6 +40,9 @@ module Baykit
           DEFAULT_CGI_MULTIPLEXER = MULTIPLEXER_TYPE_SPIDER
           DEFAULT_RECIPIENT = RECIPIENT_TYPE_SPIDER
           DEFAULT_PID_FILE = "bayserver.pid"
+          DEFAULT_ENABLE_CACHE = false
+          DEFAULT_CACHE_LIFESPAN_SEC = 60
+          DEFAULT_CACHE_SIZE_MB = 32
 
           # Default charset
           attr :charset
@@ -107,6 +110,14 @@ module Baykit
           # PID file name
           attr :pid_file
 
+          # True if cache is enabled
+          attr :enable_cache
+
+          # Lifespan seconds of cache
+          attr :cache_lifespan_sec
+
+          # Cache size
+          attr :cache_size_mb
 
           def initialize
             @grand_agents = DEFAULT_SHIP_AGENTS
@@ -128,6 +139,8 @@ module Baykit
             @cgi_multiplexer = DEFAULT_CGI_MULTIPLEXER
             @recipient = DEFAULT_RECIPIENT
             @pid_file = DEFAULT_PID_FILE
+            @cache_lifespan_sec = DEFAULT_CACHE_LIFESPAN_SEC
+            @cache_size_mb = DEFAULT_CACHE_SIZE_MB
           end
 
           ######################
@@ -182,8 +195,8 @@ module Baykit
               @log_multiplexer = DEFAULT_LOG_MULTIPLEXER
             end
 
-            if @log_multiplexer == MULTIPLEXER_TYPE_SPIN ||
-               @log_multiplexer == MULTIPLEXER_TYPE_PIGEON
+            if @cgi_multiplexer == MULTIPLEXER_TYPE_SPIN ||
+               @cgi_multiplexer == MULTIPLEXER_TYPE_PIGEON
               BayLog.warn(
                 BayMessage.get(
                   :CFG_CGI_MULTIPLEXER_NOT_SUPPORTED,
@@ -296,6 +309,16 @@ module Baykit
 
             when "pidfile"
               @pid_file = kv.value
+
+            when "enablecache"
+              @enable_cache = StringUtil.parse_bool(kv.value)
+
+            when "cachelifespan"
+              @cache_lifespan_sec = kv.value.to_i
+
+            when "cachesize"
+              @cache_size_mb = kv.value.to_i
+
             else
               return false
             end