bayserver-core 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb17be48486a6dab58c78ec9c0bc0a61becb7244eb81bcada99325f455dbc1d1
-  data.tar.gz: 51e0d53856a5b4b031a99ef7e4b7b3491478fc9bcddf9faa6302f9cfebd7e368
+  metadata.gz: 3384e309df7bc1a51935394fa90199ec3037f2a40978a6612e5c4a8ae826cdbf
+  data.tar.gz: 0dd2baf7f2cf5878eda0fcace793d50f3dce873962c983e3d49fe899542cf158
 SHA512:
-  metadata.gz: 7ddc27addfc8ad480756621204165b499f0c821029ec9c7b43b74e5571451c948b5e97dd3b01c4992533c20a4d34447bfa23f0c15007e9038b596bd9ad134f61
-  data.tar.gz: af83d798092c2def618208cfa5f42a5e0d395ffba6e4c13e28c410034c0a52a17b03b3c6002ddd528c61497efc8a3e537ea2da08e223a9e03dd0ddc2610a2b5e
+  metadata.gz: 3a84b96eba136c9bf08ec77ced8300289967bbe4a55d0aa9bdf66a4ceaad72dc0e27409878b92faf9f594ea11ed48dcff58fbc669b38daad37ef163c6d7b7bae
+  data.tar.gz: 64f1d19b52431b7f0986be35723231ea56ed17941314ce44ecab9d4a26296dc89e60f7a179f1eb71a4e5e3719de7d6630ac38a01f97a63ec20b2655707fba5f2

data/README.md

@@ -1,2 +1,3 @@
-BayServer for Ruby
-https://baykit.yokohama/about-bayserver/
+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 processors, harnessing the full potential of the CPU's capabilities.
+
+https://baykit.yokohama

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

@@ -10,6 +10,7 @@ module Baykit
 
           include Baykit::BayServer::Agent
           include Baykit::BayServer::Tours
+          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Util
 
           # class variables
@@ -165,7 +166,7 @@ module Baykit
             if tur.zombie? || tur.aborted?
               # Don't send peer any data
               BayLog::debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, tur, tur.state)
-              tur.change_state(check_id, TourState::ENDED)
+              tur.change_state(Tour::TOUR_ID_NOCHECK, TourState::ENDED)
               if callback != nil
                 callback.call()
               end
@@ -174,8 +175,8 @@ module Baykit
 
             max_len = @protocol_handler.max_res_packet_data_size();
             if len > max_len
-              send_res_content(Tour::TOUR_ID_NOCHECK, tur, bytes, ofs, max_len)
-              send_res_content(Tour::TOUR_ID_NOCHECK, tur, bytes, ofs + max_len, len - max_len, &callback)
+              send_res_content(Ship::SHIP_ID_NOCHECK, tur, bytes, ofs, max_len)
+              send_res_content(Ship::SHIP_ID_NOCHECK, tur, bytes, ofs + max_len, len - max_len, &callback)
             else
               begin
                 @protocol_handler.send_res_content(tur, bytes, ofs, len, &callback)
@@ -187,7 +188,7 @@ module Baykit
             end
           end
 
-          def send_end_tour(chk_ship_id, chk_tour_id, tur, &callback)
+          def send_end_tour(chk_ship_id, tur, &callback)
             @lock.synchronize do
               check_ship_id(chk_ship_id)
               BayLog.debug("%s sendEndTour: %s state=%s", self, tur, tur.state)
@@ -195,7 +196,7 @@ module Baykit
               if tur.zombie? || tur.aborted?
                 # Don't send peer any data. Do nothing
                 BayLog.debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, tur, tur.state)
-                tur.change_state(chk_tour_id, Tour::TourState::ENDED)
+                tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
                 callback.call()
               else
                 if !tur.valid?
@@ -216,7 +217,7 @@ module Baykit
                   end
                 end
 
-                tur.change_state(chk_tour_id, Tour::TourState::ENDED)
+                tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
 
                 @protocol_handler.send_end_tour(tur, keep_alive, &callback)
               end

data/lib/baykit/bayserver/docker/warp/warp_ship.rb

@@ -83,8 +83,13 @@ module Baykit
 
           def end_warp_tour(tur)
             wdat = WarpData.get(tur)
-            BayLog.debug("%s end: started=%s ended=%s", tur, wdat.started, wdat.ended)
-            @tour_map.delete wdat.warp_id
+            BayLog.debug("%s end warp tour: started=%s ended=%s", tur, wdat.started, wdat.ended)
+
+            if(!@tour_map.include?(wdat.warp_id))
+              raise Sink.new("%s WarpId not in tourMap: %d", tur, wdat.warp_id);
+            else
+              @tour_map.delete wdat.warp_id
+            end
             @docker.keep_ship(self)
           end
 

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

@@ -225,7 +225,7 @@ module Baykit
           end
 
           begin
-            @tour.ship.send_end_tour(@tour.ship_id, chk_tour_id, @tour, &done_lis)
+            @tour.ship.send_end_tour(@tour.ship_id, @tour, &done_lis)
           rescue IOError => e
             done_lis.call()
             raise e

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

@@ -65,6 +65,7 @@ module Baykit
               tur = @free_tours.delete_at(@free_tours.length - 1)
             else
               if !force && (@active_tour_map.length >= TourStore.max_count)
+                BayLog.warn("Max tour count reached")
                 return nil
               else
                 tur = Tour.new()

data/lib/baykit/bayserver/version.rb

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

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies: []
-description: BayServer core module
+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
+  processors, harnessing the full potential of the CPU's capabilities.
 email: michisukep@gmail.com
 executables: []
 extensions: []