process_bot 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074d3e8a15a3340496bf231b14a3a8ca664bd8c96c22372ee9bf2251740e8eda
-  data.tar.gz: 2696dbf343af1d30ca5b4c34b14f69c6278e4d441728b8454943426fe3872112
+  metadata.gz: d3abcda452c729ce0582b53ff117aa7ec8658d16ad52f05f7ff1be5e383e2422
+  data.tar.gz: 7499b97fa9e2ed082b739b241549baa4e511a5d0db0f024e921b4d174d842c20
 SHA512:
-  metadata.gz: 2c3d186e16d47a402c01d2e8b1468f814185662a397785cc4ced9f9cacd379b32dc67cf76f12e32d732184e91a361619f773163b1a701baada52f62d6c952291
-  data.tar.gz: 8763c67b5f30f9fef7f71f739802560b500f23b158b5d8d34cff49c9077f6cfcc06ab24d03c74a4e776aa3c13a0a27fbb4d576fa4a8a8262cc701a1f92c2b893
+  metadata.gz: 3680d58298af7cb511b3e5007abfafadfd3457b22230936e36f0925d6f8245b07de3116356f28b6beb18bf5cb36b86604b5bfeb323aa357adb2313d9ac20d733
+  data.tar.gz: 4bbbafc629c0b3af2f47f1c82d3aab2bceeb003dd7820df85c5764427e654e96f08e232ee4e237f1df12e0c9a28fd807b0e9902ea1520c673902c79a95b0b3c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_bot (0.1.13)
+    process_bot (0.1.15)
       knjrbfw (>= 0.0.116)
       pry
       rake

data/README.md

@@ -88,7 +88,7 @@ set :process_bot_log, false
 When running ProcessBot directly, you can control graceful waiting and log file output:
 
 ```bash
-bundle exec process_bot --command graceful --wait-for-gracefully-stopped false
+bundle exec process_bot --command graceful_no_wait
 bundle exec process_bot --command start --log-file-path /var/log/process_bot.log
 ```
 

data/lib/process_bot/capistrano/sidekiq_helpers.rb

@@ -36,14 +36,11 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     raise "No port in process bot data? #{process_bot_data}" unless process_bot_data["port"]
 
     mode = "exec"
-    wait_for_gracefully_stopped = process_bot_wait_setting(command)
 
     if mode == "runner"
       args = {command: command, port: process_bot_data.fetch("port")}
       args["log"] = fetch(:process_bot_log) unless fetch(:process_bot_log).nil?
 
-      args["wait_for_gracefully_stopped"] = wait_for_gracefully_stopped unless wait_for_gracefully_stopped.nil?
-
       escaped_args = JSON.generate(args).gsub("\"", "\\\"")
       rails_runner_command = "require 'process_bot'; ProcessBot::Process.new(ProcessBot::Options.from_args(#{escaped_args})).execute!"
 
@@ -61,7 +58,6 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
         backend_command << "#{key} #{value}"
       end
 
-      backend_command << " --wait-for-gracefully-stopped #{wait_for_gracefully_stopped}" unless wait_for_gracefully_stopped.nil?
     else
       raise "Unknown mode: #{mode}"
     end
@@ -69,13 +65,6 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     backend.execute backend_command
   end
 
-  def process_bot_wait_setting(command)
-    return true if command == :graceful
-    return false if command == :graceful_no_wait
-
-    nil
-  end
-
   def running_process_bot_processes
     sidekiq_app_name = fetch(:sidekiq_app_name, fetch(:application))
     raise "No :sidekiq_app_name was set" unless sidekiq_app_name

data/lib/process_bot/control_socket.rb

@@ -1,4 +1,6 @@
 require "socket"
+require "json"
+require "knjrbfw"
 
 class ProcessBot::ControlSocket
   attr_reader :options, :port, :process, :server
@@ -21,15 +23,25 @@ class ProcessBot::ControlSocket
   end
 
   def start_tcp_server
-    tries ||= 0
-    tries += 1
-    @server = actually_start_tcp_server("localhost", @port)
-  rescue Errno::EADDRINUSE, Errno::EADDRNOTAVAIL => e
-    if tries <= 100
-      @port += 1
-      retry
-    else
-      raise e
+    used_ports = used_process_bot_ports
+    attempts = 0
+
+    loop do
+      if used_ports.include?(@port)
+        @port += 1
+        next
+      end
+
+      attempts += 1
+      @server = actually_start_tcp_server("localhost", @port)
+      break
+    rescue Errno::EADDRINUSE, Errno::EADDRNOTAVAIL => e
+      if attempts <= 100
+        @port += 1
+        next
+      else
+        raise e
+      end
     end
   end
 
@@ -43,10 +55,16 @@ class ProcessBot::ControlSocket
 
   def run_client_loop
     Thread.new do
-      client = server.accept
+      loop do
+        begin
+          client = server.accept
+        rescue IOError, Errno::EBADF
+          break
+        end
 
-      Thread.new do
-        handle_client(client)
+        Thread.new do
+          handle_client(client)
+        end
       end
     end
   end
@@ -67,15 +85,7 @@ class ProcessBot::ControlSocket
             {}
           end
 
-          if command_type == "graceful_no_wait"
-            command_type = "graceful"
-            command_options[:wait_for_gracefully_stopped] = false
-          end
-
-          logger.logs "Command #{command_type} with options #{command_options}"
-
-          process.__send__(command_type, **command_options)
-          client.puts(JSON.generate(type: "success"))
+          run_command(command_type, command_options, client)
         rescue => e # rubocop:disable Style/RescueStandardError
           logger.error e.message
           logger.error e.backtrace
@@ -100,4 +110,32 @@ class ProcessBot::ControlSocket
 
     new_hash
   end
+
+  def run_command(command_type, command_options, client)
+    logger.logs "Command #{command_type} with options #{command_options}"
+
+    process.__send__(command_type, **command_options)
+    client.puts(JSON.generate(type: "success"))
+  end
+
+  def used_process_bot_ports
+    ports = []
+
+    Knj::Unix_proc.list("grep" => "ProcessBot") do |process|
+      process_command = process.data.fetch("cmd")
+      match = process_command.match(/ProcessBot (\{.+\})/)
+      next unless match
+
+      begin
+        process_data = JSON.parse(match[1])
+      rescue JSON::ParserError
+        next
+      end
+
+      port = process_data["port"]
+      ports << port.to_i if port
+    end
+
+    ports.uniq
+  end
 end

data/lib/process_bot/process/handlers/sidekiq.rb

@@ -21,10 +21,6 @@ class ProcessBot::Process::Handlers::Sidekiq
     Process.detach(pid) if pid
   end
 
-  def false_value?(value)
-    !value || value == "false"
-  end
-
   def process_running?(pid)
     return false unless pid
 
@@ -121,20 +117,6 @@ class ProcessBot::Process::Handlers::Sidekiq
     end
   end
 
-  def handle_graceful_wait(wait_for_gracefully_stopped)
-    if false_value?(wait_for_gracefully_stopped)
-      logger.logs "Dont wait for gracefully stopped - doing that in fork..."
-
-      daemonize do
-        wait_for_no_jobs_and_stop_sidekiq
-        exit
-      end
-    else
-      logger.logs "Wait for gracefully stopped..."
-      wait_for_no_jobs_and_stop_sidekiq
-    end
-  end
-
   def start_command # rubocop:disable Metrics/AbcSize
     args = []
 
@@ -159,15 +141,29 @@ class ProcessBot::Process::Handlers::Sidekiq
     command
   end
 
-  def graceful(**args)
-    wait_for_gracefully_stopped = args.fetch(:wait_for_gracefully_stopped, true)
+  def graceful(**_args)
     process.set_stopped
 
     return unless ensure_current_pid?
 
     return unless send_tstp_or_return
 
-    handle_graceful_wait(wait_for_gracefully_stopped)
+    logger.logs "Wait for gracefully stopped..."
+    wait_for_no_jobs_and_stop_sidekiq
+  end
+
+  def graceful_no_wait(**_args)
+    process.set_stopped
+
+    return unless ensure_current_pid?
+
+    return unless send_tstp_or_return
+
+    logger.logs "Dont wait for gracefully stopped - doing that in fork..."
+    daemonize do
+      wait_for_no_jobs_and_stop_sidekiq
+      exit
+    end
   end
 
   def stop(**_args)

data/lib/process_bot/process.rb

@@ -6,6 +6,7 @@ class ProcessBot::Process
   extend Forwardable
 
   def_delegator :handler_instance, :graceful
+  def_delegator :handler_instance, :graceful_no_wait
   def_delegator :handler_instance, :stop
 
   autoload :Handlers, "#{__dir__}/process/handlers"
@@ -29,10 +30,8 @@ class ProcessBot::Process
     if command == "start"
       logger.logs "Starting process"
       start
-    elsif command == "graceful" || command == "stop"
+    elsif command == "graceful" || command == "graceful_no_wait" || command == "stop"
       send_control_command(command)
-    elsif command == "graceful_no_wait"
-      send_control_command(command, wait_for_gracefully_stopped: false)
     else
       raise "Unknown command: #{command}"
     end

data/lib/process_bot/version.rb

@@ -1,3 +1,3 @@
 module ProcessBot
-  VERSION = "0.1.13".freeze
+  VERSION = "0.1.15".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - kaspernj