bayserver-docker-cgi 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb12007ac5ff474ce860f5809ff065af555a64ef5eaf88007a7053c0e6991d5
-  data.tar.gz: 79ec49ef0f447b6aaf0c7ee2f35171e35bdcd77a7cb97252c4801419783d98de
+  metadata.gz: b69f13e53289413270d966247cb5c22bab95b4fd81acd9c0cdfccb189627db6f
+  data.tar.gz: c3efa92676178b25626e5a4a4d57a19c48d308603914f92290d4e2ac1dcc5084
 SHA512:
-  metadata.gz: ae783b21b39acdd9feae4c22d32f73c644fe51b3600c2cf99f9ce9053ec91d4fcbe090264b5caf33fdb32b1f36538a9bf927930151497bc1be283f166f91c18e
-  data.tar.gz: e935d8206653665138d375adef086f4d2e68d95837cbfc3c28da7f31047dd44cfb00efc5ef9bcabc0ddd00fece6de4b9d25d6afe4d5e664a81ca135220e0c192
+  metadata.gz: b9f9784da221bd460e0885d5ef79bf05ab055fcd12717ffbb278d11cda4f2b2a3dd702e89be1569bf7a3c3e13ee4c79f2fe01dd99f102bdc870db73010525fab
+  data.tar.gz: 244042e90cbd62de5b5d21552e45a72085fdc6b54190138ed2f90053b443df65b6fbf29fe6c9603c5ec8f5d8167533685f4c65624ae11d43633c50cfba22e4b6

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

@@ -29,11 +29,12 @@ module Baykit
           include Baykit::BayServer::Taxi
 
           DEFAULT_PROC_READ_METHOD = Harbor::FILE_SEND_METHOD_TAXI
-          DEFAULT_TIMEOUT_SEC = 60
+          DEFAULT_TIMEOUT_SEC = 0
 
           attr :interpreter
           attr :script_base
           attr :doc_root
+          attr :timeout_sec
 
           # Method to read stdin/stderr
           attr :proc_read_method
@@ -93,12 +94,13 @@ module Baykit
               when "taxi"
                 @proc_read_method = Harbor::FILE_SEND_METHOD_TAXI
 
-              when "timeout"
-                @timeout_sec = int(kv.value)
-
               else
                 raise ConfigException.new(kv.file_name, kv.line_no, BayMessage.get(:CFG_INVALID_PARAMETER_VALUE, kv.value))
               end
+
+            when "timeout"
+              @timeout_sec = kv.value.to_i
+
             else
               return super
             end
@@ -159,12 +161,12 @@ module Baykit
             case(@proc_read_method)
             when Harbor::FILE_SEND_METHOD_SELECT
               out_tp = PlainTransporter.new(false, bufsize)
-              out_yat.init(tur, out_tp)
+              out_yat.init(tur, out_tp, handler)
               out_tp.init(tur.ship.agent.non_blocking_handler, handler.std_out[0], out_yat)
               out_tp.open_valve()
 
               err_tp = PlainTransporter.new(false, bufsize)
-              err_yat.init(tur)
+              err_yat.init(tur, handler)
               err_tp.init(tur.ship.agent.non_blocking_handler, handler.std_err[0], err_yat)
               err_tp.open_valve()
 
@@ -181,27 +183,27 @@ module Baykit
               end
 
               out_tp = SpinReadTransporter.new(bufsize)
-              out_yat.init(tur, out_tp)
+              out_yat.init(tur, out_tp, handler)
               out_tp.init(tur.ship.agent.spin_handler, out_yat, handler.std_out[0], -1, @timeout_sec, eof_checker)
               out_tp.open_valve()
 
               err_tp = SpinReadTransporter.new(bufsize)
-              err_yat.init(tur)
+              err_yat.init(tur, handler)
               err_tp.init(tur.ship.agent.spin_handler, err_yat, handler.std_out[0], -1, @timeout_sec, eof_checker)
               err_tp.open_valve()
 
             when Harbor::FILE_SEND_METHOD_TAXI
-              out_txi = ReadFileTaxi.new(bufsize)
-              out_yat.init(tur, out_txi)
+              out_txi = ReadFileTaxi.new(tur.ship.agent.agent_id, bufsize)
+              out_yat.init(tur, out_txi, handler)
               out_txi.init(handler.std_out[0], out_yat)
-              if !TaxiRunner.post(out_txi)
+              if !TaxiRunner.post(tur.ship.agent.agent_id, out_txi)
                 raise HttpException.new(HttpStatus.SERVICE_UNAVAILABLE, "Taxi is busy!")
               end
 
-              err_txi = ReadFileTaxi.new(bufsize)
-              err_yat.init(tur)
+              err_txi = ReadFileTaxi.new(tur.ship.agent.agent_id, bufsize)
+              err_yat.init(tur, @timeout_sec)
               err_txi.init(handler.std_err[0], err_yat)
-              if !TaxiRunner.post(err_txi)
+              if !TaxiRunner.post(tur.ship.agent.agent_id, err_txi)
                 raise HttpException.new(HttpStatus.SERVICE_UNAVAILABLE, "Taxi is busy!")
               end
 

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

@@ -28,11 +28,14 @@ module Baykit
           attr :std_err
           attr :std_out_closed
           attr :std_err_closed
+          attr :last_access
 
           def initialize(cgi_docker, tur)
             @cgi_docker = cgi_docker
             @tour = tur
             @tour_id = tur.tour_id
+            @std_out_closed = true
+            @std_err_closed = true
           end
 
           ######################################################
@@ -45,10 +48,12 @@ module Baykit
             wrote_len = @std_in[1].write(buf[start, len])
             BayLog.debug("%s CGI:onReadReqContent: wrote=%d", tur, wrote_len)
             tur.req.consumed(Tour::TOUR_ID_NOCHECK, len)
+            access()
           end
 
           def on_end_content(tur)
             BayLog.trace("%s CGI:endReqContent", tur)
+            access()
           end
 
           def on_abort(tur)
@@ -92,7 +97,7 @@ module Baykit
 
             @std_out_closed = false
             @std_err_closed = false
-
+            access()
           end
 
           def std_out_closed()
@@ -109,13 +114,27 @@ module Baykit
             end
           end
 
+          def access()
+            @last_access = Time.now.to_i
+          end
+
+          def timed_out()
+            if @cgi_docker.timeout_sec <= 0
+              return false
+            end
+
+            duration_sec = Time.now.to_i - @last_access
+            BayLog.debug("%s Check CGI timeout: dur=%d, timeout=%d", @tour, duration_sec, @cgi_docker.timeout_sec)
+            return duration_sec > @cgi_docker.timeout_sec
+          end
+
           def process_finished()
+            BayLog.debug("%s CGI Process finished: pid=%s", @tour, @pid)
+
             pid, stat = Process.wait2(@pid)
+            print(stat)
 
             BayLog.debug("%s CGI Process finished: pid=%s code=%s", @tour, pid, stat.exitstatus)
-            if pid == nil
-              BayLog.error("Process not finished: %d", @pid)
-            end
 
             begin
               if stat.exitstatus != 0

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

@@ -14,6 +14,7 @@ module Baykit
 
           attr :tour
           attr :tour_id
+          attr :handler
 
           def initialize
             super
@@ -31,6 +32,7 @@ module Baykit
           def reset()
             @tour = nil
             @tour_id = 0
+            @timeout_sec = 0
           end
 
           ######################################################
@@ -49,28 +51,29 @@ module Baykit
           end
 
           def notify_eof()
-            BayLog.debug("%s CGI StdErr: EOF\\(^o^)/", self)
+            BayLog.debug("%s stderr EOF\\(^o^)/", @tour)
             return NextSocketAction::CLOSE
           end
 
           def notify_close()
-            BayLog.debug("%s CGI StdErr: notifyClose", self)
+            BayLog.debug("%s stderr notifyClose", @tour)
             @tour.req.content_handler.std_err_closed()
           end
 
-          def check_timeout(duration)
-            BayLog.warn("%s invalid timeout check", self)
-            return false
+          def check_timeout(duration_sec)
+            BayLog.debug("%s stderr Check timeout: dur=%d, timeout=%d", @tour, duration_sec, @timeout_sec)
+            return @handler.timed_out()
           end
 
           ######################################################
           # Custom methods
           ######################################################
 
-          def init(tur)
+          def init(tur, handler)
             init_yacht()
             @tour = tur
             @tour_id = tur.tour_id
+            @handler = handler
           end
         end
       end

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

@@ -19,6 +19,7 @@ module Baykit
 
           attr :remain
           attr :header_reading
+          attr :handler
 
           def initialize
             super
@@ -39,6 +40,7 @@ module Baykit
             @tour_id = 0
             @header_reading = true
             @remain = ""
+            @handler = nil
           end
 
           ######################################################
@@ -112,6 +114,7 @@ module Baykit
               end
             end
 
+            @handler.access()
             if available
               return NextSocketAction::CONTINUE;
             else
@@ -121,17 +124,25 @@ module Baykit
           end
 
           def notify_eof()
-            BayLog.debug("%s CGI StdOut: EOF(^o^)", self)
+            BayLog.debug("%s stdout EOF(^o^)", @tour)
             return NextSocketAction::CLOSE
           end
 
           def notify_close()
-            BayLog.debug("%s CGI StdOut: notifyClose", self)
+            BayLog.debug("%s stdout notifyClose", @tour)
             @tour.req.content_handler.std_out_closed()
           end
 
-          def check_timeout(duration)
-            BayLog.warn("%s invalid timeout check", self)
+          def check_timeout(duration_sec)
+            BayLog.debug("%s Check StdOut timeout: dur=%d", @tour, duration_sec)
+
+            if @handler.timed_out()
+              # Kill cgi process instead of handing timeout
+              BayLog.warn("%s Kill process!: %d", @tour, @handler.pid)
+              Process.kill("KILL", @handler.pid)
+              return true
+            end
+
             return false
           end
 
@@ -139,8 +150,9 @@ module Baykit
           # Custom methods
           ######################################################
 
-          def init(tur, valve)
+          def init(tur, valve, handler)
             init_yacht()
+            @handler = handler
             @tour = tur
             @tour_id = tur.tour_id
             tur.res.set_consume_listener do |len, resume|

metadata

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