bayserver-core 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bca64c229f0bad4d592192eeff7d6daefdc188399675a1fc60f8ba768294ef
-  data.tar.gz: 2020fd1e4f422ce497dd12b8c6107101a4c3e15cc22fda349edc689d8542a4d6
+  metadata.gz: f16ef089e90f79b3ab9ff9e3ad60146b5fc25cc1aa569981ffc2f23738e75ed4
+  data.tar.gz: 8de08a5578314ed72c24b5580da7f9b819d1a42b218db39785490725646f00c8
 SHA512:
-  metadata.gz: 6b8d633c192766082c8e9d9cfa5b161aa982803b55d0f5c3e6a09c86b3aac65b549254f9dca34fd4f8cf4b1f68d4cb1c6ae2d1f9f5236ade26b753eedd62c607
-  data.tar.gz: 58458cf12a212850c552c08827cdee15e6e7bd78fdf4bd9b87e22505fe034c843494fc008566b7b73a4c3a4b4c72e150f810e8b320caa6670f941667afbde12a
+  metadata.gz: 88238e6b083141720fd92f5816e7a66c49b39d93a656514ca81c2edfbfa312efb9daf6f34f0390ce2c035138d998e3eb56223170b47b180bc676337fb4236812
+  data.tar.gz: 137cbe39e65d8d3144e17767f49d136764a19ca9b299a8b55817daad5a1650bacc042f2561e92f21e7411706eaf0afda6e752abfb6d68223c3d2e6126c20276b

data/lib/baykit/bayserver/agent/signal/signal_agent.rb

@@ -39,46 +39,6 @@ module Baykit
           @signal_map = {}
           @signal_agent = nil
 
-          attr :port
-          attr :server_skt
-
-          def initialize(port)
-            @port = port
-            @server_skt = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-            @server_skt.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
-            adr = Socket.sockaddr_in(@port, "127.0.0.1")
-            @server_skt.bind(adr)
-            @server_skt.listen(0)
-            BayLog.info( BayMessage.get(:MSG_OPEN_CTL_PORT, @port))
-          end
-
-          def on_socket_readable()
-
-            begin
-              skt, = @server_skt.accept
-              skt.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, [5, 0].pack("l_2"))
-
-              line = skt.readline.strip()
-              BayLog.info(BayMessage.get(:MSG_COMMAND_RECEIVED, line))
-              SignalAgent.handle_command(line)
-              skt.write("OK\n")
-              skt.flush
-
-            rescue => e
-              BayLog.error_e(e)
-
-            ensure
-              if skt
-                skt.close()
-              end
-            end
-
-          end
-
-          def close
-            @server_skt.close
-          end
-
 
           ######################################################
           # class methods
@@ -92,7 +52,7 @@ module Baykit
             end
 
             if bay_port > 0
-              @signal_agent = SignalAgent.new(bay_port)
+              run_signal_agent(bay_port)
             end
           end
 
@@ -153,9 +113,36 @@ module Baykit
             end
           end
 
-          def SignalAgent.term()
-            if @signal_agent
-              @signal_agent.close()
+          def self.run_signal_agent(port)
+            Thread.new do
+              server_skt = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+              server_skt.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+              adr = Socket.sockaddr_in(port, "127.0.0.1")
+              server_skt.bind(adr)
+              server_skt.listen(0)
+              BayLog.info( BayMessage.get(:MSG_OPEN_CTL_PORT, @port))
+
+              while true
+                begin
+                  skt, = server_skt.accept
+                  skt.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, [5, 0].pack("l_2"))
+
+                  line = skt.readline.strip()
+                  BayLog.info(BayMessage.get(:MSG_COMMAND_RECEIVED, line))
+                  SignalAgent.handle_command(line)
+                  skt.write("OK\n")
+                  skt.flush
+
+                rescue => e
+                  BayLog.error_e(e)
+
+                ensure
+                  if skt
+                    skt.close()
+                  end
+                end
+
+              end
             end
           end
         end

data/lib/baykit/bayserver/bayserver.rb

@@ -275,32 +275,6 @@ module Baykit
 
           return
 
-          while not GrandAgentMonitor.monitors.empty?
-            sel = Selector.new()
-            pip_to_mon_map = {}
-            GrandAgentMonitor.monitors.values.each do |mon|
-              BayLog.debug("Monitoring pipe of %s", mon)
-              sel.register(mon.communication_channel, Selector::OP_READ)
-              pip_to_mon_map[mon.communication_channel] = mon
-            end
-            server_skt = nil
-            if SignalAgent.signal_agent
-              server_skt = SignalAgent.signal_agent.server_skt
-              sel.register(server_skt, Selector::OP_READ)
-            end
-
-            selected_map = sel.select(nil)
-            selected_map.keys().each do |ch|
-              if ch == server_skt
-                SignalAgent.signal_agent.on_socket_readable()
-              else
-                mon = pip_to_mon_map[ch]
-                mon.on_readable()
-              end
-            end
-          end
-
-          SignalAgent.term()
 
         rescue => err
           BayLog.fatal_e(err, "%s", err.message)

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

@@ -32,7 +32,7 @@ module Baykit
         attr :headers
         attr_accessor :charset
         attr :available
-        attr :consume_listener
+        attr :res_consume_listener
 
         attr_accessor :header_sent
         attr :yacht
@@ -74,7 +74,7 @@ module Baykit
           end
 
           @available = false
-          @consume_listener = nil
+          @res_consume_listener = nil
 
           @can_compress = false
           @compressor = nil
@@ -156,12 +156,16 @@ module Baykit
         end
 
         def set_consume_listener(&listener)
-          @consume_listener = listener
+          @res_consume_listener = listener
           @bytes_consumed = 0
           @bytes_posted = 0
           @available = true
         end
 
+        def detach_consume_listener
+          @res_consume_listener = nil
+        end
+
         def send_res_content(chk_tour_id, buf, ofs, len)
           @tour.check_tour_id(chk_tour_id)
           BayLog.debug("%s sendContent len=%d", @tour, len)
@@ -182,7 +186,7 @@ module Baykit
           end
 
 
-          if @consume_listener == nil
+          if @res_consume_listener == nil
             raise Sink.new("Response consume listener is null")
           end
 
@@ -277,9 +281,6 @@ module Baykit
 
         def consumed(check_id, length)
           @tour.check_tour_id(check_id)
-          if @consume_listener == nil
-            raise Sink.new("Response consume listener is null")
-          end
 
           @bytes_consumed += length
 
@@ -297,7 +298,11 @@ module Baykit
           end
 
           if !@tour.zombie?
-            @consume_listener.call(length, resume)
+            if @res_consume_listener == nil
+              BayLog.debug("%s Consume listener is null, so can not invoke callback", self)
+            else
+              @res_consume_listener.call(length, resume)
+            end
           end
         end
 

data/lib/baykit/bayserver/version.rb

@@ -1,7 +1,7 @@
 module Baykit
   module BayServer
       class Version
-        VERSION='3.0.0'
+        VERSION='3.0.2'
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2024-11-17 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