bayserver-docker-cgi 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026b08fd6b265203501cda3e9e9773fe454e6fdf976ebeee9b61213e64f9c6fa
-  data.tar.gz: 218a642cb48c9dbe00c2c4a61168149d6d1299bc2633af532c978b0564ccaa5a
+  metadata.gz: f70194757e9c4347167411f22f25db380b4805795646ca94d862523b359e3a56
+  data.tar.gz: f308a4b899c6911f1ca487377acffd532072433b9b9856ec28d17e25ff58f2a9
 SHA512:
-  metadata.gz: 4df74f7890b2d04f99fdf77c5d5dfef52a5fe92701be2b9973ae03b5e9e24637a712258456ef4288ae526962d2a00137c145394456c2a876b4017eaba0cced57
-  data.tar.gz: f1b03d78cd01ac5ff46ec8e7bc0bda82c3df6b4958168f4f3b4378d1fbc7f706bf0f31a6da7725a700570f6ba7011c4eb1796cae88d24a97d09c776c592e84be
+  metadata.gz: 0b4158f7da8f7576632fdf8d3df6e91581e10c43dd4de08ffd5f01aae9357fe6a3260c9ab6b89202f7e2d340c9f8d653d39c12e45ad18bf58578d4d8f994a154
+  data.tar.gz: 7fbc50159631dc800b67a4b1e14296b17ae87104913d81304f7d942bb74d7808a1f9826ec9c597ec2e436c111a855b02a63eae479276a64618d81f316ad6e778

data/lib/baykit/bayserver/docker/cgi/cgi_docker.rb

@@ -164,11 +164,11 @@ module Baykit
           end
 
           def sub_process_count
-            return @process_count -= 1
+            @process_count -= 1
           end
 
           def sub_wait_count
-            return @wait_count -= 1
+            @wait_count -= 1
           end
         end
       end

data/lib/baykit/bayserver/docker/cgi/cgi_req_content_handler.rb

@@ -38,14 +38,20 @@ module Baykit
           attr :last_access
           attr_accessor :multiplexer
           attr :env
+          attr :buffers
 
           def initialize(cgi_docker, tur, env)
             @cgi_docker = cgi_docker
             @tour = tur
             @tour_id = tur.tour_id
             @env = env
+            @pid = 0
+            @std_in_rd = nil
+            @std_out_rd = nil
+            @std_err_rd = nil
             @std_out_closed = true
             @std_err_closed = true
+            @buffers = []
           end
 
           ######################################################
@@ -64,9 +70,12 @@ module Baykit
           def on_read_req_content(tur, buf, start, len, &callback)
             BayLog.debug("%s CGI:onReadReqContent: len=%d", tur, len)
 
-            wrote_len = @std_in_rd.write(buf[start, len])
-            BayLog.debug("%s CGI:onReadReqContent: wrote=%d", tur, wrote_len)
-            tur.req.consumed(Tour::TOUR_ID_NOCHECK, len, &callback)
+            if @pid != 0
+              write_to_std_in(tur, buf, start, len, &callback)
+            else
+              # postponed
+              @buffers << [buf[start, len].dup, callback]
+            end
             access()
           end
 
@@ -135,6 +144,11 @@ module Baykit
             @std_err_rd = IORudder.new(std_err[0])
             BayLog.debug("#{@tour} PID: #{pid}")
 
+            @buffers.each do |pair|
+              BayLog.debug("%s write postponed data: len=%d", @tour, pair[0].length)
+              write_to_std_in(@tour, pair[0], 0, pair[0].length, &pair[1])
+            end
+
             @std_out_closed = false
             @std_err_closed = false
 
@@ -233,6 +247,12 @@ module Baykit
             return duration_sec > @cgi_docker.timeout_sec
           end
 
+          def write_to_std_in(tur, buf, start, len, &callback)
+            wrote_len = @std_in_rd.write(buf[start, len])
+            BayLog.debug("%s CGI:onReadReqContent: wrote=%d", tur, wrote_len)
+            tur.req.consumed(Tour::TOUR_ID_NOCHECK, len, &callback)
+          end
+
           def process_finished()
             BayLog.debug("%s CGI Process finished: pid=%s", @tour, @pid)
 

data/lib/baykit/bayserver/docker/cgi/cgi_std_err_ship.rb

@@ -57,17 +57,17 @@ module Baykit
           end
 
           def notify_eof()
-            BayLog.debug("agt#%d CGI stderr EOF\\(^o^)/", @agent_id)
+            BayLog.debug("%s CGI stderr EOF\\(^o^)/ tur=%s", self, @tour)
             return NextSocketAction::CLOSE
           end
 
           def notify_close()
-            BayLog.debug("agt#%d CGI stderr notifyClose", @agent_id)
+            BayLog.debug("%s CGI stderr notifyClose tur=%s", self, @tour)
             @handler.std_err_closed()
           end
 
           def check_timeout(duration_sec)
-            BayLog.debug("%s stderr Check timeout: dur=%d", @tour, duration_sec)
+            BayLog.debug("%s stderr Check timeout: tur=%s dur=%d", self, @tour, duration_sec)
             return @handler.timed_out()
           end
 

data/lib/baykit/bayserver/docker/cgi/cgi_std_out_ship.rb

@@ -57,7 +57,7 @@ module Baykit
 
           def notify_read(buf)
             @file_wrote_len += buf.length
-            BayLog.trace("%s read file %d bytes: total=%d", self, buf.length, @file_wrote_len)
+            BayLog.debug("%s on read (len=%d total=%d)", self, buf.length, @file_wrote_len)
 
             pos = 0
             if @header_reading
@@ -132,25 +132,25 @@ module Baykit
           end
 
           def notify_error(e)
-            BayLog.debug_e(e, "%s CGI notifyError", self)
+            BayLog.debug_e(e, "%s CGI notifyError tur=%s", self, @tour)
           end
 
           def notify_eof()
-            BayLog.debug("%s stdout EOF(^o^)", @tour)
+            BayLog.debug("%s stdout EOF(^o^) tur=%s", self, @tour)
             return NextSocketAction::CLOSE
           end
 
           def notify_close()
-            BayLog.debug("%s stdout notifyClose", @tour)
+            BayLog.debug("%s stdout notifyClose tur=%s", self, @tour)
             @handler.std_out_closed()
           end
 
           def check_timeout(duration_sec)
-            BayLog.debug("%s Check StdOut timeout: dur=%d", @tour, duration_sec)
+            BayLog.debug("%s Check StdOut timeout: tur=%s dur=%d", self, @tour, duration_sec)
 
             if @handler.timed_out()
               # Kill cgi process instead of handing timeout
-              BayLog.warn("%s Kill process!: %d", @tour, @handler.pid)
+              BayLog.warn("%s Process timed out! Kill process!: tur=%s pid=%d", self, @tour, @handler.pid)
               Process.kill("KILL", @handler.pid)
               return true
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-docker-cgi
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-17 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bayserver-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.3
 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.