bayserver-core 2.2.2 → 2.3.1

data/lib/baykit/bayserver/tours/tour_res.rb

@@ -82,6 +82,7 @@ module Baykit
           @bytes_posted = 0
           @bytes_consumed = 0
           @bytes_limit = 0
+          @tour_returned = false
         end
 
         ######################################################
@@ -121,8 +122,16 @@ module Baykit
             end
           end
 
-          @tour.ship.send_headers(@tour.ship_id, @tour)
-          @header_sent = true
+          begin
+            @tour.ship.send_headers(@tour.ship_id, @tour)
+          rescue IOError => e
+            BayLog.debug_e(e, "%s abort: %s", @tour, e)
+            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            raise e
+          ensure
+            @header_sent = true
+          end
+
         end
 
         def send_redirect(chk_tour_id, status, location)
@@ -132,9 +141,15 @@ module Baykit
             BayLog.error("Try to redirect after response header is sent (Ignore)")
           else
             set_consume_listener(&ContentConsumeListener::DEV_NULL)
-            @tour.ship.send_redirect(@tour.ship_id, @tour, status, location)
-            @header_sent = true
-            end_content(chk_tour_id)
+            begin
+              @tour.ship.send_redirect(@tour.ship_id, @tour, status, location)
+            rescue IOError => e
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+              raise e
+            ensure
+              @header_sent = true
+              end_content(chk_tour_id)
+            end
           end
 
         end
@@ -170,27 +185,31 @@ module Baykit
             raise Sink.new("Response consume listener is null")
           end
 
+          @bytes_posted += len
           BayLog.debug("%s posted res content len=%d posted=%d limit=%d consumed=%d",
           @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
           if @bytes_limit > 0 && @bytes_limit < self.bytes_posted
             raise ProtocolException.new("Post data exceed content-length: " + @bytes_posted + "/" + @bytes_limit)
           end
 
-          if @can_compress
-            get_compressor().compress(buf, ofs, len, &done_lis)
+          if @tour.zombie? || @tour.aborted?
+            # Don't send peer any data
+            BayLog::debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, @tour, @tour.state)
+            done_lis.call()
           else
-            begin
-              @tour.ship.send_res_content(@tour.ship_id, @tour, buf, ofs, len, &done_lis)
-            rescue IOError => e
-              done_lis.call()
-              raise e
+            if @can_compress
+              get_compressor().compress(buf, ofs, len, &done_lis)
+            else
+              begin
+                @tour.ship.send_res_content(@tour.ship_id, @tour, buf, ofs, len, &done_lis)
+              rescue IOError => e
+                done_lis.call()
+                @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+                raise e
+              end
             end
           end
 
-          @bytes_posted += len
-
-          BayLog.debug("%s post res content: len=%d posted=%d limit=%d consumed=%d",
-                       @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
 
           old_available = @available
           if !buffer_available()
@@ -208,6 +227,10 @@ module Baykit
           @tour.check_tour_id(chk_tour_id)
 
           BayLog.debug("%s end ResContent", self)
+          if @tour.ended?
+            BayLog.debug("%s Tour is already ended (Ignore).", self)
+            return
+          end
 
           if !@tour.zombie? && @tour.city != nil
             @tour.city.log(@tour)
@@ -220,15 +243,34 @@ module Baykit
 
 
           # Done listener
+          tour_returned = false
           done_lis = Proc.new() do
+            @tour.check_tour_id(chk_tour_id)
             @tour.ship.return_tour(@tour)
+            tour_returned = true
           end
 
           begin
-            @tour.ship.send_end_tour(@tour.ship_id, @tour, &done_lis)
-          rescue IOError => e
-            done_lis.call()
-            raise e
+            if @tour.zombie? || @tour.aborted?
+              # Don't send peer any data. Do nothing
+              BayLog.debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, @tour, @tour.state)
+              done_lis.call()
+            else
+              begin
+                @tour.ship.send_end_tour(@tour.ship_id, @tour, &done_lis)
+              rescue IOError => e
+                BayLog.debug("%s Error on sending end tour", self)
+                done_lis.call()
+                raise e
+              end
+            end
+          ensure
+            # If tour is returned, we cannot change its state because
+            # it will become uninitialized.
+            BayLog.debug("%s tur#%d is returned: %s", self, chk_tour_id, tour_returned)
+            if !tour_returned
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
+            end
           end
         end
 
@@ -281,15 +323,26 @@ module Baykit
           end
 
           if @header_sent
-            BayLog.warn("Try to send error after response header is sent (Ignore)")
-            BayLog.warn("%s: status=%d, message=%s", self, status, msg)
+            BayLog.debug("Try to send error after response header is sent (Ignore)")
+            BayLog.debug("%s: status=%d, message=%s", self, status, msg)
             if err != nil
               BayLog.error_e(err);
             end
           else
             set_consume_listener(&ContentConsumeListener::DEV_NULL)
-            @tour.ship.send_error(@tour.ship_id, @tour, status, msg, err)
-            @header_sent = true
+
+            if @tour.zombie? || @tour.aborted?
+              # Don't send peer any data. Do nothing
+              BayLog.debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, @tour, @tour.state)
+            else
+              begin
+                @tour.ship.send_error(@tour.ship_id, @tour, status, msg, err)
+              rescue IOError => e
+                BayLog.debug("%s Error on sending error", self)
+                @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+              end
+              @header_sent = true
+            end
           end
 
           end_content(chk_tour_id)
@@ -306,7 +359,7 @@ module Baykit
 
           if File.directory?(file)
             raise HttpException.new HttpStatus::FORBIDDEN, file
-          elsif !File.exists?(file)
+          elsif !File.exist?(file)
             raise HttpException.new HttpStatus::NOT_FOUND, file
           end
 
@@ -357,11 +410,11 @@ module Baykit
                 tp.open_valve()
 
               when Harbor::FILE_SEND_METHOD_TAXI
-                txi = ReadFileTaxi.new(bufsize)
+                txi = ReadFileTaxi.new(@tour.ship.agent.agent_id, bufsize)
                 @yacht.init(@tour, file, txi)
                 txi.init(File.open(file, "rb"), @yacht)
-                if !TaxiRunner.post(txi)
-                  raise HttpException.new(HttpStatus.SERVICE_UNAVAILABLE, "Taxi is busy!");
+                if !TaxiRunner.post(@tour.ship.agent.agent_id, txi)
+                  raise HttpException.new(HttpStatus::SERVICE_UNAVAILABLE, "Taxi is busy!");
                 end
 
               else
@@ -382,9 +435,18 @@ module Baykit
 
         def get_compressor()
           if @compressor == nil
-            @compressor = GzipCompressor.new(lambda do |new_buf, new_ofs, new_len, &lis|
-              @tour.ship.send_res_content(@tour.ship_id, @tour, new_buf, new_ofs, new_len, &lis)
-            end)
+            sip_id = @tour.ship.ship_id
+            tur_id = @tour.tour_id
+            gz_callback = lambda do |new_buf, new_ofs, new_len, &lis|
+              begin
+                @tour.ship.send_res_content(sip_id, @tour, new_buf, new_ofs, new_len, &lis)
+              rescue IOError => e
+                @tour.change_state(tur_id, Tour::TourState::ABORTED)
+                raise e
+              end
+            end
+
+            @compressor = GzipCompressor.new(gz_callback)
           end
 
           return @compressor

data/lib/baykit/bayserver/tours/tour_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/tours/tour'
 require 'baykit/bayserver/util/string_util'
 
@@ -15,7 +16,7 @@ module Baykit
 
 
         class AgentListener
-          include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener  # implements
+          include Baykit::BayServer::Agent::LifecycleListener  # implements
 
           def add(agt)
             TourStore.stores[agt.agent_id] = TourStore.new();

data/lib/baykit/bayserver/util/executor_service.rb

@@ -20,17 +20,25 @@ module Baykit
             @name = name
           end
 
+          def to_s
+            @name
+          end
+
           def run
             while true
-              tsk = @que.deq
-              #BayLog.debug("%s Start task on: %s", tsk, @name)
-              tsk.run
-              #BayLog.debug("%s End task on: %s", tsk, @name)
+              block = @que.deq
+              if block == nil
+                break
+              end
+              BayLog.debug("Start task on: %s", @name)
+              block.call
+              BayLog.debug("End task on: %s", @name)
             end
           end
 
-          def to_s
-            @name
+          def shutdown
+            @que.pop until @que.empty?
+            @que.enq(nil)
           end
         end
 
@@ -40,12 +48,14 @@ module Baykit
         attr :count
         attr :max_queue_len
         attr :name
+        attr :executors
 
         def initialize(name, count)
           @que = Thread::Queue.new
           @count = count
           @max_queue_len = MAX_LEN_PER_EXECUTOR * count
           @name = name
+          @executors = []
 
           count.times do |i|
             started = false
@@ -56,6 +66,7 @@ module Baykit
               Thread.current.name = th_name
               e = Executor.new @que, id, th_name
               e.run
+              @executors << e
             end
             while !started
               sleep(0.01)
@@ -63,17 +74,23 @@ module Baykit
           end
         end
 
-        def to_s()
+        def to_s
           return "ExecutorService[#{@name}]"
         end
 
         # post task
-        def submit(tsk)
-          BayLog.debug("%s Submit: task=%s (qlen=%d/%d)", self, tsk, @que.length, @max_queue_len)
+        def submit(&block)
+          BayLog.debug("%s Submit: (qlen=%d/%d)", self, @que.length, @max_queue_len)
           if @que.length > @max_queue_len
             raise IOError("Task queue is full (>_<)")
           end
-          @que.enq(tsk)
+          @que.enq(block)
+        end
+
+        def shutdown
+          @executors.each do |exe|
+            exe.shutdown
+          end
         end
       end
     end

data/lib/baykit/bayserver/version.rb

@@ -1,7 +1,7 @@
 module Baykit
   module BayServer
       class Version
-        VERSION='2.2.2'
+        VERSION='2.3.1'
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.1
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies: []
 description: BayServer is one of the high-speed web servers. It operates as a single-threaded,
   asynchronous server, which makes it exceptionally fast. It also supports multi-core
@@ -25,6 +25,7 @@ files:
 - lib/baykit/bayserver/agent/command_receiver.rb
 - lib/baykit/bayserver/agent/grand_agent.rb
 - lib/baykit/bayserver/agent/grand_agent_monitor.rb
+- lib/baykit/bayserver/agent/lifecycle_listener.rb
 - lib/baykit/bayserver/agent/next_socket_action.rb
 - lib/baykit/bayserver/agent/non_blocking_handler.rb
 - lib/baykit/bayserver/agent/package.rb
@@ -32,6 +33,7 @@ files:
 - lib/baykit/bayserver/agent/signal/signal_proxy.rb
 - lib/baykit/bayserver/agent/signal/signal_sender.rb
 - lib/baykit/bayserver/agent/spin_handler.rb
+- lib/baykit/bayserver/agent/timer_handler.rb
 - lib/baykit/bayserver/agent/transporter/data_listener.rb
 - lib/baykit/bayserver/agent/transporter/package.rb
 - lib/baykit/bayserver/agent/transporter/plain_transporter.rb