bayserver-core 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9553fc51408c4fdcf0cfdab84dedbfe4787dfb635c6d80fb35f8ed8931d45e94
-  data.tar.gz: 1621adc0afcd182c88d92334c5492573c7832a1d4fdd32ad446e69715546a534
+  metadata.gz: 3384e309df7bc1a51935394fa90199ec3037f2a40978a6612e5c4a8ae826cdbf
+  data.tar.gz: 0dd2baf7f2cf5878eda0fcace793d50f3dce873962c983e3d49fe899542cf158
 SHA512:
-  metadata.gz: 9e2f3c03c747fa755ac913a8036afd5269310f1933ff10331d533b778fcf06f0e68003e79bba992d02cb3595264433901bdc9779b4845d4c883832811eb0a208
-  data.tar.gz: a43916c531db4c6c7a473de166c91079386b6e6ac88071db6eaf2a23cb7637351c97ea7a8cbf8ea96390244775859246faf3cc357bdc4164589b223e18419af7
+  metadata.gz: 3a84b96eba136c9bf08ec77ced8300289967bbe4a55d0aa9bdf66a4ceaad72dc0e27409878b92faf9f594ea11ed48dcff58fbc669b38daad37ef163c6d7b7bae
+  data.tar.gz: 64f1d19b52431b7f0986be35723231ea56ed17941314ce44ecab9d4a26296dc89e60f7a179f1eb71a4e5e3719de7d6630ac38a01f97a63ec20b2655707fba5f2

data/LICENSE.BAYKIT

@@ -0,0 +1,53 @@
+/*
+ * The Baykit Public License, Version 1.1
+ *
+ * Copyright (c) 2000 The Yokohama Baykit.  All rights reserved.
+ *
+ * This license is based on the Apache Software License 1.1
+ *                           (http://xml.apache.org/LICENSE) 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:  
+ *       "This product includes software developed by the
+ *        Yokohama Baykit (http://www.baykit.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The name "Baykit" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written 
+ *    permission, please contact xml@baykit.org.
+ *
+ * 5. Products derived from this software may not be called "Baykit",
+ *    nor may "Baykit" appear in their name, without prior written
+ *    permission of the Yokohama Baykit.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE BAYKIT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * For more information on the Yokohama Baykit, please see
+ * <http://www.baykit.org/>.
+ */

data/README.md

@@ -0,0 +1,3 @@
+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/agent/non_blocking_handler.rb

@@ -344,6 +344,13 @@ module Baykit
             ch_state.access
           end
 
+          def close_all()
+            @ch_map.keys().each do |ch|
+              st = find_channel_state(ch)
+              close_channel(ch, st)
+            end
+          end
+
 
           private
 

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.0'
+        VERSION='2.2.2'
       end
   end
 end

metadata

@@ -1,21 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 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: []
 extra_rdoc_files: []
 files:
+- LICENSE.BAYKIT
+- README.md
 - lib/baykit/bayserver/agent/accept_handler.rb
 - lib/baykit/bayserver/agent/channel_listener.rb
 - lib/baykit/bayserver/agent/command_receiver.rb