process_bot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b719a497be535319bf027f1669321e58466f845657bdebb82f94d78f6d6e984f
-  data.tar.gz: cbbbc984e75edacbcdf6e9f8579633e6ebac87cf4e0690b944a7e32b4424c4f1
+  metadata.gz: 24914d42c043171014a4dacebea43987204236a2dadb14d2fcc4f8bda936e628
+  data.tar.gz: b9248c4189e0d52826728401e940bed7ba46e330fb7f391d587ba00f23b160e3
 SHA512:
-  metadata.gz: fdbd9fd4a6196cf6d9183289ec7c9ee984d25e5e2af0af5c8213a5fe649865687aa70f0dcf5a49f91100c7ceae72298e9bb9bdcb9dac9861c86b50209528d1a6
-  data.tar.gz: 97942320a0a9354770aa8f4e155a620a1c232c5fd712d2269f525d76b1a00adc2480c6c8e51c79c8eb2047a391224c6597e4c9bc74bf4b3369aa0664b7418e1d
+  metadata.gz: a92b6568aaf9e799f5d318cd63c900185c4f6cacb4578c7f6fc3769933e571b27b7f48f27d7c33a93ce700d5e3990ea53c0f50a5b39c31ae9153130502c770bc
+  data.tar.gz: 3eb45c1dd31b202ac80b0c1b7925e60ed682fd5f42210a768459c6b456d84b9a76cc7618b67ead9f576482ded5b9d47501039d51d158a5125bfab258097c43ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_bot (0.1.3)
+    process_bot (0.1.4)
       knjrbfw (>= 0.0.116)
 
 GEM
@@ -13,7 +13,7 @@ GEM
     diff-lcs (1.5.0)
     http2 (0.0.36)
       string-cases (~> 0)
-    json (2.6.3)
+    json (2.7.0)
     knjrbfw (0.0.116)
       datet
       http2
@@ -21,10 +21,12 @@ GEM
       ruby_process
       tsafe
       wref (>= 0.0.8)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
     parallel (1.23.0)
-    parser (3.2.2.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     php4r (0.0.4)
       datet
       http2
@@ -32,10 +34,11 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.0)
-    rexml (3.2.5)
+    rake (13.1.0)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -49,28 +52,32 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rubocop (1.58.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
-    rubocop-performance (1.17.1)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby_process (0.0.13)
       string-cases
@@ -79,7 +86,7 @@ GEM
     string-cases (0.0.4)
     string-strtr (0.0.3)
     tsafe (0.0.12)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     wref (0.0.8)
 
 PLATFORMS

data/exe/process_bot

@@ -18,6 +18,12 @@ while argv_i < ARGV.length
 
   if (match = arg.match(/\A--(.+)\Z/))
     key = match[1].tr("-", "_").to_sym
+
+    if key == :path
+      puts "Path: #{File.realpath("#{__dir__}/..")}"
+      exit
+    end
+
     argv_i += 1
     value = ARGV.fetch(argv_i)
 

data/lib/process_bot/capistrano/sidekiq_helpers.rb

@@ -32,16 +32,34 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     end
   end
 
-  def process_bot_command(process_bot_data, command)
+  def process_bot_command(process_bot_data, command) # rubocop:disable Metrics/AbcSize
     raise "No port in process bot data? #{process_bot_data}" unless process_bot_data["port"]
 
-    backend_command = "cd #{release_path} && " \
-      "#{SSHKit.config.command_map.prefix[:bundle].join(" ")} bundle exec process_bot " \
-      "--command #{command} " \
-      "--port #{process_bot_data.fetch("port")}"
+    mode = "exec"
 
-    if command == :graceful && !fetch(:process_bot_wait_for_gracefully_stopped).nil?
-      backend_command << " --wait-for-gracefully-stopped #{fetch(:process_bot_wait_for_gracefully_stopped)}"
+    if mode == "runner"
+      args = {command: command, port: process_bot_data.fetch("port")}
+
+      if command == :graceful && !fetch(:process_bot_wait_for_gracefully_stopped).nil?
+        args["wait_for_gracefully_stopped"] = fetch(:process_bot_wait_for_gracefully_stopped)
+      end
+
+      escaped_args = JSON.generate(args).gsub("\"", "\\\"")
+      rails_runner_command = "require 'process_bot'; ProcessBot::Process.new(ProcessBot::Options.from_args(#{escaped_args})).execute!"
+
+      backend_command = "cd #{release_path} && " \
+        "#{SSHKit.config.command_map.prefix[:bundle].join(" ")} bundle exec rails runner \"#{rails_runner_command}\""
+    elsif mode == "exec"
+      backend_command = "cd #{release_path} && " \
+        "#{SSHKit.config.command_map.prefix[:bundle].join(" ")} bundle exec process_bot " \
+        "--command #{command} " \
+        "--port #{process_bot_data.fetch("port")}"
+
+      if command == :graceful && !fetch(:process_bot_wait_for_gracefully_stopped).nil?
+        backend_command << " --wait-for-gracefully-stopped #{fetch(:process_bot_wait_for_gracefully_stopped)}"
+      end
+    else
+      raise "Unknown mode: #{mode}"
     end
 
     backend.execute backend_command
@@ -126,7 +144,7 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     screen_args = ["-dmS process-bot--sidekiq--#{idx}-#{latest_release_version}"]
 
     if (process_bot_sidekiq_log = fetch(:process_bot_sidekig_log))
-      screen_args << "-L -Logfile #{process_bot_sidekiq_log}"
+      screen_args << "-L -Logfile #{process_bot_sidekiq_log}_#{latest_release_version}_#{idx}.log"
     elsif fetch(:sidekiq_log)
       screen_args << "-L -Logfile #{fetch(:sidekiq_log)}"
     end

data/lib/process_bot/client_socket.rb

@@ -8,14 +8,19 @@ class ProcessBot::ClientSocket
   end
 
   def client
-    @client ||= TCPSocket.new("localhost", options.fetch(:port).to_i)
+    @client ||= Socket.tcp("localhost", options.fetch(:port).to_i, connect_timeout: 2)
   end
 
   def close
     client.close
   end
 
-  def send_command(data)
+  def logger
+    @logger ||= ProcessBot::Logger.new(options: options)
+  end
+
+  def send_command(data) # rubocop:disable Metrics/AbcSize
+    logger.log "Sending: #{data}"
     client.puts(JSON.generate(data))
     response_raw = client.gets
 
@@ -26,6 +31,11 @@ class ProcessBot::ClientSocket
 
     return :success if response.fetch("type") == "success"
 
-    raise "Command raised an error: #{response.fetch("message")}" if response.fetch("type") == "error"
+    if response.fetch("type") == "error"
+      error = RuntimeError.new("Command raised an error: #{response.fetch("message")}")
+      error.set_backtrace(response.fetch("backtrace") + Thread.current.backtrace)
+
+      raise error
+    end
   end
 end

data/lib/process_bot/control_socket.rb

@@ -8,6 +8,10 @@ class ProcessBot::ControlSocket
     @process = process
   end
 
+  def logger
+    @logger ||= ProcessBot::Logger.new(options: options)
+  end
+
   def port
     options.fetch(:port).to_i
   end
@@ -16,7 +20,7 @@ class ProcessBot::ControlSocket
     @server = TCPServer.new("localhost", port)
     run_client_loop
 
-    puts "TCPServer started"
+    logger.logs "TCPServer started"
 
     options.events.call(:on_socket_opened, port: port)
   end
@@ -45,16 +49,38 @@ class ProcessBot::ControlSocket
 
       if command_type == "graceful" || command_type == "stop"
         begin
-          process.__send__(command_type)
+          command_options = if command["options"]
+            symbolize_keys(command.fetch("options"))
+          else
+            {}
+          end
+
+          logger.logs "Command #{command_type} with options #{command_options}"
+
+          process.__send__(command_type, **command_options)
           client.puts(JSON.generate(type: "success"))
         rescue => e # rubocop:disable Style/RescueStandardError
-          client.puts(JSON.generate(type: "error", message: e.message))
+          logger.logs e.message, type: :stderr
+          logger.logs e.backtrace, type: :stderr
+
+          client.puts(JSON.generate(type: "error", message: e.message, backtrace: e.backtrace))
 
           raise e
         end
       else
-        client.puts(JSON.generate(type: "error", message: "Unknown command: #{command_type}"))
+        client.puts(JSON.generate(type: "error", message: "Unknown command: #{command_type}", backtrace: Thread.current.backtrace))
       end
     end
   end
+
+  def symbolize_keys(hash)
+    new_hash = {}
+    hash.each do |key, value|
+      next if key == "port"
+
+      new_hash[key.to_sym] = value
+    end
+
+    new_hash
+  end
 end

data/lib/process_bot/logger.rb

@@ -6,7 +6,7 @@ class ProcessBot::Logger
   end
 
   def log(output, type: :stdout)
-    if type == :stdout
+    if type == :stdout || (type == :debug && options[:debug])
       $stdout.print output
     elsif type == :stderr
       $stderr.print output
@@ -20,6 +20,10 @@ class ProcessBot::Logger
     fp_log.flush
   end
 
+  def logs(output, **args)
+    log("#{output}\n", **args)
+  end
+
   def log_file_path
     options.fetch(:log_file_path)
   end

data/lib/process_bot/options.rb

@@ -1,6 +1,16 @@
 class ProcessBot::Options
   attr_reader :options
 
+  def self.from_args(args)
+    options = ProcessBot::Options.new
+
+    args.each do |key, value|
+      options.set(key, value)
+    end
+
+    options
+  end
+
   def initialize(options = {})
     @options = options
   end

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

@@ -1,14 +1,38 @@
 class ProcessBot::Process::Handlers::Sidekiq
-  attr_reader :options
+  attr_reader :options, :process
 
-  def initialize(options)
-    @options = options
+  def initialize(process)
+    @process = process
+    @options = process.options
+  end
+
+  def current_pid
+    process.current_pid
+  end
+
+  def daemonize
+    logger.logs "Daemonize!"
+
+    pid = Process.fork do
+      Process.daemon
+      yield
+    end
+
+    Process.detach(pid) if pid
+  end
+
+  def false_value?(value)
+    !value || value == "false"
   end
 
   def fetch(*args, **opts)
     options.fetch(*args, **opts)
   end
 
+  def logger
+    @logger ||= ProcessBot::Logger.new(options: options)
+  end
+
   def set_option(key, value)
     raise "Unknown option for Sidekiq handler: #{key}" unless options.key?(key)
 
@@ -42,4 +66,72 @@ class ProcessBot::Process::Handlers::Sidekiq
     command << "'"
     command
   end
+
+  def graceful(**args)
+    wait_for_gracefully_stopped = args.fetch(:wait_for_gracefully_stopped, true)
+    process.set_stopped
+
+    unless current_pid
+      warn "Sidekiq not running with a PID"
+      return
+    end
+
+    Process.kill("TSTP", current_pid)
+
+    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 stop(**_args)
+    process.set_stopped
+
+    unless current_pid
+      warn "#{handler_name} not running with a PID"
+      return
+    end
+
+    Process.kill("TERM", current_pid)
+  end
+
+  def wait_for_no_jobs # rubocop:disable Metrics/AbcSize
+    loop do
+      found_process = false
+
+      Knj::Unix_proc.list("grep" => current_pid) do |process|
+        process_command = process.data.fetch("cmd")
+        process_pid = process.data.fetch("pid").to_i
+        next unless process_pid == current_pid
+
+        found_process = true
+        sidekiq_regex = /\Asidekiq (\d+).(\d+).(\d+) (#{options.possible_process_titles_joined_regex}) \[(\d+) of (\d+)(\]|) (.+?)(\]|)\Z/
+        match = process_command.match(sidekiq_regex)
+        raise "Couldnt match Sidekiq command: #{process_command} with Sidekiq regex: #{sidekiq_regex}" unless match
+
+        running_jobs = match[5].to_i
+
+        logger.logs "running_jobs: #{running_jobs}"
+
+        return if running_jobs.zero? # rubocop:disable Lint/NonLocalExitFromIterator
+      end
+
+      raise "Couldn't find running process with PID #{current_pid}" unless found_process
+
+      sleep 1
+    end
+  end
+
+  def wait_for_no_jobs_and_stop_sidekiq
+    logger.logs "Wait for no jobs and Stop sidekiq"
+    wait_for_no_jobs
+    stop
+  end
 end

data/lib/process_bot/process/runner.rb

@@ -27,7 +27,7 @@ class ProcessBot::Process::Runner
 
     PTY.spawn(command, err: stderr_writer.fileno) do |stdout, _stdin, pid|
       @subprocess_pid = pid
-      logger.log "Command running with PID #{pid}: #{command}\n"
+      logger.logs "Command running with PID #{pid}: #{command}"
 
       stdout_reader_thread = Thread.new do
         stdout.each_char do |chunk|

data/lib/process_bot/process.rb

@@ -1,6 +1,13 @@
+require "forwardable"
 require "json"
+require "string-cases"
 
 class ProcessBot::Process
+  extend Forwardable
+
+  def_delegator :handler_instance, :graceful
+  def_delegator :handler_instance, :stop
+
   autoload :Handlers, "#{__dir__}/process/handlers"
   autoload :Runner, "#{__dir__}/process/runner"
 
@@ -13,7 +20,7 @@ class ProcessBot::Process
     options.events.connect(:on_process_started, &method(:on_process_started)) # rubocop:disable Performance/MethodObjectAsBlock
     options.events.connect(:on_socket_opened, &method(:on_socket_opened)) # rubocop:disable Performance/MethodObjectAsBlock
 
-    logger.log("Options: #{options.options}")
+    logger.logs("ProcessBot 1 - Options: #{options.options}")
   end
 
   def execute!
@@ -22,7 +29,7 @@ class ProcessBot::Process
     if command == "start"
       start
     elsif command == "graceful" || command == "stop"
-      client.send_command(command: command)
+      client.send_command(command: command, options: options.options)
     else
       raise "Unknown command: #{command}"
     end
@@ -39,6 +46,10 @@ class ProcessBot::Process
     end
   end
 
+  def handler_instance
+    @handler_instance ||= handler_class.new(self)
+  end
+
   def handler_name
     @handler_name ||= options.fetch(:handler)
   end
@@ -71,42 +82,17 @@ class ProcessBot::Process
       if stopped
         break
       else
-        puts "Process stopped - starting again after 1 sec"
+        logger.logs "Process stopped - starting again after 1 sec"
         sleep 1
       end
     end
   end
 
-  def graceful
-    @stopped = true
-
-    unless current_pid
-      warn "#{handler_name} not running with a PID"
-      return
-    end
-
-    Process.kill("TSTP", current_pid)
-
-    if options[:wait_for_gracefully_stopped] == "false"
-      Thread.new { wait_for_no_jobs_and_stop_sidekiq }
-    else
-      wait_for_no_jobs_and_stop_sidekiq
-    end
-  end
-
-  def stop
+  def set_stopped
     @stopped = true
-
-    unless current_pid
-      warn "#{handler_name} not running with a PID"
-      return
-    end
-
-    Process.kill("TERM", current_pid)
   end
 
   def run
-    handler_instance = handler_class.new(options)
     runner = ProcessBot::Process::Runner.new(command: handler_instance.start_command, logger: logger, options: options)
     runner.run
   end
@@ -116,38 +102,4 @@ class ProcessBot::Process
     @current_process_title = "ProcessBot #{JSON.generate(process_args)}"
     Process.setproctitle(current_process_title)
   end
-
-  def wait_for_no_jobs # rubocop:disable Metrics/AbcSize
-    loop do
-      found_process = false
-
-      Knj::Unix_proc.list("grep" => current_pid) do |process|
-        process_command = process.data.fetch("cmd")
-        process_pid = process.data.fetch("pid").to_i
-        next unless process_pid == current_pid
-
-        found_process = true
-        sidekiq_regex = /\Asidekiq (\d+).(\d+).(\d+) (#{options.possible_process_titles_joined_regex}) \[(\d+) of (\d+)(\]|) (.+?)(\]|)\Z/
-        match = process_command.match(sidekiq_regex)
-        raise "Couldnt match Sidekiq command: #{process_command} with Sidekiq regex: #{sidekiq_regex}" unless match
-
-        running_jobs = match[5].to_i
-
-        puts "running_jobs: #{running_jobs}"
-
-        return if running_jobs.zero? # rubocop:disable Lint/NonLocalExitFromIterator
-      end
-
-      raise "Couldn't find running process with PID #{current_pid}" unless found_process
-
-      sleep 1
-    end
-  end
-
-  def wait_for_no_jobs_and_stop_sidekiq
-    puts "Wait for no jobs and Stop sidekiq"
-
-    wait_for_no_jobs
-    stop
-  end
 end

data/lib/process_bot/version.rb

@@ -1,3 +1,3 @@
 module ProcessBot
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.17
 signing_key: 
 specification_version: 4
 summary: Run and control processes.