blue_green_process 0.1.4 → 0.1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8905db7b63e35a80a3fa1272553fa4f84002e06747501b5749110a6edfed79e
-  data.tar.gz: 467fbb4d348d6fae9cfc70a013f88a560cc69a97690451d0b53908585d312e20
+  metadata.gz: de6dcd9d5d0d1f000d05cecc5a9e71c9aac40785ab9b662ed3f3e355520583b8
+  data.tar.gz: 869f46eade0cbc23f0ad787f37c32dc88e00a8887bdb4d8d16761a00725f10d3
 SHA512:
-  metadata.gz: f042564e95f91038d87faaae43d891d798204784a27f0b2fb1a038df195717c58755c7a65531216d97f4477296dee1775119ba1c01560c7fb067a336c1b613aa
-  data.tar.gz: 28d937c6280847b821ef49f4c247649549a13bf4a5c0f62d444cb6d5c391d88c491ac2d2fcca38a56947e4eb66b5583200885b4cc4e4f40c63cd61c2a8ac5bc1
+  metadata.gz: 3f91ae14371f167c9d1b4ca8480a4b8a02c3487daca3a19e0ce299a99d46c56fe47381a6ed30c61399415995865b7f4118aa7ce823ca1bdd60f27b64fc6e6b7a
+  data.tar.gz: b3f7831d0b007d35ba40958b7b14e6faac6f2ad67f0d03bacc1f515f37474f0889c7514bc01dd88c30b74be590dcf20597f0395982dee00119f1ef6e603c04c6

data/.rubocop.yml

@@ -40,3 +40,6 @@ Metrics/ClassLength:
 
 Lint/AmbiguousBlockAssociation:
   Enabled: false
+
+Layout/LineLength:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,14 @@
-## [0.1.4] - 2022-12-
-* BlueGreenProcess.terminate_workers_immediately を呼び出すことで、シグナル経由で終了できるようになりました
+## [0.1.4.3] - 2024-1-8
+- 処理を停止するときにpidを書いたファイルを削除するようになりました
+
+## [0.1.4.2] - 2022-12-25
+* プロセス終了時にDRb.stop_serviceを呼ぶのをやめました
+
+## [0.1.4.1] - 2022-12-13
+* プロセス終了時にDRb.stop_serviceを呼ぶようにしました
+
+## [0.1.4] - 2022-12-12
+* BlueGreenProcess.terminate_workers_immediately を呼び出すことで、masterプロセスからシグナル経由でworkerプロセスを終了できるようになりました
 
 ## [0.1.3] - 2022-9-5
 * 単一プロセスでの実行を延長するとGC.startを実行しなくなりました

data/Gemfile

@@ -8,4 +8,4 @@ gemspec
 gem "pry"
 gem "rake"
 gem "rspec"
-gem "rubocop", "~> 1.21"
+gem "rubocop"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blue_green_process (0.1.4)
+    blue_green_process (0.1.4.3)
 
 GEM
   remote: https://rubygems.org/
@@ -12,11 +12,13 @@ GEM
     json (2.6.2)
     method_source (1.0.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.3.0.2)
       ast (~> 2.4.1)
+      racc
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
@@ -59,7 +61,4 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop (~> 1.21)
-
-BUNDLED WITH
-   2.3.15
+  rubocop

data/README.md

@@ -2,29 +2,6 @@
 
 A library that solves GC bottlenecks with multi-process.
 
-```mermaid
-sequenceDiagram
-  autonumber
-  loop
-  Master->>+Blue: be active
-  Blue->>-Master: response
-  Master->>+Blue: work
-  Blue->>-Master: response
-  Master->>+Blue: be inactive
-  Blue->>-Master: response
-  Blue-->>Blue: GC.start
-  Master->>+Green: be active
-  Green->>-Master: response
-  Master->>+Green: work
-  Green->>-Master: response
-  Master->>+Green: be inactive
-  Green->>-Master: response
-  Green->>Green: GC.start
-end
- 
-```
-
-
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

data/lib/blue_green_process/master_process.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "English"
 module BlueGreenProcess
   class ErrorWrapper < StandardError
     attr_accessor :error_class, :message
@@ -70,9 +71,7 @@ module BlueGreenProcess
                                data: BlueGreenProcess::SharedVariable.data }.to_json)
             ::GC.start unless BlueGreenProcess::SharedVariable.extend_run_on_this_process
           when BlueGreenProcess::PROCESS_COMMAND_WORK
-            if process_status == BlueGreenProcess::PROCESS_STATUS_INACTIVE
-              warn "Should not be able to run in this status"
-            end
+            warn "Should not be able to run in this status" if process_status == BlueGreenProcess::PROCESS_STATUS_INACTIVE
 
             begin
               worker_instance.work(*label)
@@ -116,6 +115,9 @@ module BlueGreenProcess
     def shutdown
       @processes.each(&:shutdown)
       Process.waitall
+    ensure
+      # 正常終了だとworkerから削除するケースはないんだけど、想定外のエラーが起きた時を考慮してworkerから削除する
+      FileUtils.rm_rf(BlueGreenProcess::PID_PATH)
     end
 
     private
@@ -159,8 +161,10 @@ module BlueGreenProcess
           while (readable_io = IO.select([self_read]))
             signal = readable_io.first[0].gets.strip
             case signal
-            when "INT", "TERM"
+            when "TERM"
               raise Interrupt
+            when "INT"
+              BlueGreenProcess.logger.warn "[BLUE_GREEN_PROCESS][#{$PROCESS_ID}] INTシグナルは無視します"
             end
           end
         rescue Interrupt

data/lib/blue_green_process/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlueGreenProcess
-  VERSION = "0.1.4"
+  VERSION = "0.1.4.3"
 end

data/lib/blue_green_process/worker_process.rb

@@ -49,7 +49,7 @@ module BlueGreenProcess
     def wait_response
       return unless (text = read)
 
-      response = JSON.parse(text.strip)
+      response = JSON.parse(text.strip.scrub)
       BlueGreenProcess::SharedVariable.instance.restore(response["data"])
       case response["c"]
       when BlueGreenProcess::RESPONSE_OK

data/lib/blue_green_process.rb

@@ -57,18 +57,25 @@ module BlueGreenProcess
 
   # @return [void]
   def self.terminate_workers_immediately
+    BlueGreenProcess.logger.warn "[BLUE_GREEN_PROCESS][#{$PROCESS_ID}] TERMシグナルを送信します"
+
     worker_pids = nil
     begin
       worker_pids = File.read(PID_PATH).split(",").map(&:to_i)
     rescue Errno::ENOENT
-      warn("#{PID_PATH}にファイルがありませんでした")
+      BlueGreenProcess.logger.warn("[BLUE_GREEN_PROCESS] #{PID_PATH}にファイルがありませんでした")
       return
     end
 
     worker_pids.each do |worker_pid|
       Process.kill "TERM", worker_pid
     rescue Errno::ESRCH => e
-      warn("BlueGreenProcess workerプロセス(#{worker_pid})の終了に失敗しました。", e.message)
+      BlueGreenProcess.logger.warn("[BLUE_GREEN_PROCESS][#{$PROCESS_ID}] workerプロセス(#{worker_pid})の終了に失敗しました。#{e.message}")
     end
+    BlueGreenProcess.logger.warn "[BLUE_GREEN_PROCESS][#{$PROCESS_ID}] workerプロセスへTERMシグナルを送信しました"
+    Process.waitall
+    BlueGreenProcess.logger.warn "[BLUE_GREEN_PROCESS][#{$PROCESS_ID}] workerプロセスが終了しました"
+  ensure
+    FileUtils.rm_rf(BlueGreenProcess::PID_PATH)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue_green_process
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.4.3
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies: []
 description: A library that solves GC bottlenecks with multi-process.
 email: