bayserver-core 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f0a7628ec3be8f1d727392730648c785b8018968fb343dc20434549ae60abae
-  data.tar.gz: 0ef73388d47ef99c304a1b0aaaa951eec6d25222a5fbb0bd71e7f6aeb37edebd
+  metadata.gz: ef1870c148ef4f045575bdd31e28b5e13808013fa159e0642a627471e0b80962
+  data.tar.gz: 0247c5d8b92f4c9f1cf95b20ae02687202d524c6edd82158711bce98fa5e8e6e
 SHA512:
-  metadata.gz: cd9122b0cfaf0eae17477d39ec7fd9e323a7944210222a6182861a91a11087da69560d4e70bca2f25c14f76804af0e57ffbf09c3c5fd2f5337b80351e98a74d6
-  data.tar.gz: 32b56a60249f626736a1102681cabbc1dec4f7dca68ee8e156c5a42930a04b38c69ca77aeef8eedc979d3ca419b5371ccb12ee1d758675c1af1b3facda28f439
+  metadata.gz: c3460ae4f7b5d50945fb20e5f6072838fe7277ccf6d6b9f0cd9d8e51e4ecd3c87a729121cc1d502edb8ddb120841e99377a63ba62324515a74de06d27fe769b6
+  data.tar.gz: 22d1f706b151704256cf55526e8b4bc6d29a04c2ab543c9803cb32316719239140997390d7b88b500e1d248cc8281821e68666ba68f2abdddd247880a2dbc698

data/lib/baykit/bayserver/agent/grand_agent.rb

@@ -196,7 +196,7 @@ module Baykit
             end # while
 
           rescue => e
-            BayLog.fatal(e)
+            BayLog.fatal_e(e)
           ensure
             BayLog.info("%s end", self)
             shutdown()
@@ -211,13 +211,15 @@ module Baykit
           end
 
           @command_receiver.end()
+          @non_blocking_handler.close_all()
+
           GrandAgent.listeners.each do |lis|
             lis.remove(self)
           end
 
           GrandAgent.agents.delete(@agent_id)
-          clean()
 
+          @agent_id = -1
           if BayServer.harbor.multi_core
             exit(1)
           end
@@ -225,6 +227,10 @@ module Baykit
 
         def abort_agent()
           BayLog.info("%s abort", self)
+
+          if BayServer.harbor.multi_core
+            exit(1)
+          end
         end
 
         def req_shutdown()
@@ -280,11 +286,6 @@ module Baykit
           val = IOUtil.read_int32(pipe_fd)
         end
 
-        def clean()
-          @non_blocking_handler.close_all()
-          @agent_id = -1
-        end
-
         ######################################################
         # class methods
         ######################################################

data/lib/baykit/bayserver/agent/grand_agent_monitor.rb

@@ -25,11 +25,13 @@ module Baykit
         attr :agent_id
         attr :anchorable
         attr :communication_channel
+        attr :child_pid
 
-        def initialize(agt_id, anchorable, com_channel)
+        def initialize(agt_id, anchorable, com_channel, child_pid)
           @agent_id = agt_id
           @anchorable = anchorable
           @communication_channel = com_channel
+          @child_pid = child_pid
         end
 
         def to_s()
@@ -42,7 +44,7 @@ module Baykit
             if res == nil || res == GrandAgent::CMD_CLOSE
               BayLog.debug("%s read Close", self)
               close()
-              GrandAgentMonitor.agent_aborted(@agent_id, @anchorable)
+              agent_aborted()
             else
               BayLog.debug("%s read OK: %d", self, res)
             end
@@ -81,6 +83,33 @@ module Baykit
           @communication_channel.close()
         end
 
+        def agent_aborted()
+          BayLog.info(BayMessage.get(:MSG_GRAND_AGENT_SHUTDOWN, @agent_id))
+
+          if @child_pid != nil
+            begin
+              Process.kill("TERM", @child_pid)
+            rescue => e
+              BayLog.debug_e(e, "Error on killing process")
+            end
+            Process.wait(@child_pid)
+          end
+          GrandAgentMonitor.monitors.delete(@agent_id)
+
+          if not GrandAgentMonitor.finale
+            if GrandAgentMonitor.monitors.length < GrandAgentMonitor.num_agents
+              begin
+                if !BayServer.harbor.multi_core
+                  GrandAgent.add(-1, @anchorable)
+                end
+                GrandAgentMonitor.add(@anchorable)
+              rescue => e
+                BayLog.error_e(e)
+              end
+            end
+          end
+        end
+
         ########################################
         # Class methods
         ########################################
@@ -151,32 +180,16 @@ module Baykit
               agt.run()
             end
 
+            child = nil
+
           end
 
           @monitors[agt_id] =
             GrandAgentMonitor.new(
               agt_id,
               anchoroable,
-              client_socket)
-        end
-
-        def self.agent_aborted(agt_id, anchorable)
-          BayLog.info(BayMessage.get(:MSG_GRAND_AGENT_SHUTDOWN, agt_id))
-
-          @monitors.delete(agt_id)
-
-          if not @finale
-            if @monitors.length < @num_agents
-              begin
-                if !BayServer.harbor.multi_core
-                  GrandAgent.add(-1, anchorable)
-                end
-                add(anchorable)
-              rescue => e
-                BayLog.error_e(e)
-              end
-            end
-          end
+              client_socket,
+              child)
         end
 
         def self.reload_cert_all()

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

@@ -77,6 +77,8 @@ module Baykit
                 end
                 tur.init(tur_key, self)
                 @active_tours.append(tur)
+              else
+                tur.ship.check_ship_id(@ship_id)
               end
             end
             return tur

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

@@ -203,7 +203,7 @@ module Baykit
           end
 
           def return_protocol_handler(agt, proto_hnd)
-            BayLog.debug("%s Return protocol handler: ", proto_hnd)
+            BayLog.debug("%s Return protocol handler", proto_hnd)
             PortBase.get_protocol_handler_store(proto_hnd.protocol, agt).Return(proto_hnd)
           end
 

data/lib/baykit/bayserver/taxi/taxi_runner.rb

@@ -20,6 +20,7 @@ module Baykit
           end
 
           def remove(agt)
+            BayLog.debug("%s Remove tax runner", agt)
             TaxiRunner.runners[agt.agent_id - 1].terminate()
             TaxiRunner.runners[agt.agent_id - 1] = nil
           end

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

@@ -338,7 +338,7 @@ module Baykit
               begin
                 @tour.ship.send_error(@tour.ship_id, @tour, status, msg, err)
               rescue IOError => e
-                BayLog.debug("%s Error on sending error", self)
+                BayLog.debug_e(e, "%s Error on sending error", self)
                 @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
               end
               @header_sent = true

data/lib/baykit/bayserver/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-23 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