ext_batch 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52aeecd3a82748aa907ad6d5f3ca59df5570b8da
-  data.tar.gz: 518adee2c3a7c4375ebb42b0c5eecb8497396c9c
+  metadata.gz: a9a0df57a53bf0e1deae15000a355b93914284a3
+  data.tar.gz: 03a7b9f81c2cf3b9f4d706e8700664c79c677e0e
 SHA512:
-  metadata.gz: 62639aba2fa865b6c03856195a3009de2485930da664bc47da1a49c2606fba5e29bbba217943f79b966e990ae78816dce7c48f0ebd9178eb123669cad0d47bc8
-  data.tar.gz: b4c3aff281e9ee23e0bda9aebf97da56fb9b3216a94f8d532c958b67aad44eec6ea0bd553f5d346fce17c3ec39175a4ca1f0762e25f8ae0347f78c8900f51c6b
+  metadata.gz: 36c392fbfbcf6d85076c83b606ef7ddf18f250a7a62bd65366749f431e64aff4df5b6563776eb22fe75e18e19785e5d350bdac6737036fa1122343ca8eb94503
+  data.tar.gz: 0139654785e69ec6c75e207cb9a4485e56d18a88c6993231b8914228fa1ab119a97c363ac515a87ee2ae4528daec307882ef62f3d31592329f19a1cb87caeeff

data/ext_batch.gemspec

@@ -35,5 +35,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mail", "~> 2.5"
   spec.add_dependency "sys-proctable", "~> 1.2"
+  spec.add_dependency "sidekiq", ">= 3.4"
+  spec.add_dependency "sidekiq-scheduler", "2.1.7"
+
   spec.add_dependency "ext_logger", "~> 0.2"
 end

data/lib/ext_batch/main.rb

@@ -16,6 +16,61 @@ class ExtBatch
   SEND_MAIL_NO   = 'no'
   SEND_MAIL_YES  = 'yes'
 
+  PID_FILE_PATH = ExtLogger.rails_root + '/tmp/batch_pids/'
+
+  def self.monitor_pid_file(batch=nil)
+    logger = batch if batch.is_a?(ExtBatch)
+
+    path = self.get_pid_file_path
+    if File.directory?(path)
+      Dir.foreach(path) do |file|
+        file_name = File.basename(file)
+        if file_name.include?('.pid')
+          pid = nil
+
+          # Get batch pid file
+          File.open(File.join(path, file_name), 'r') do |f|
+            while line = f.gets
+              pid = line.to_i
+            end
+          end
+
+          # Delete batch pid file
+          if pid && !ProcTable.ps(pid: pid)
+            logger.info "Delete file: #{file_name}, pid: #{pid}"
+            File.delete(file_name)
+          end
+        end
+      end
+    end
+  end
+
+  # Get file name for batch process pid
+  def self.get_pid_file_name
+    return @pid_file[:name] || ''
+  end
+
+  # Set file path for batch process pid
+  def self.set_pid_file_path(str)
+    @@pid_file_path = str if str.is_a?(String) && !is_blank?(str)
+  end
+
+  # Get file path for batch process pid
+  def self.get_pid_file_path
+    return @@pid_file_path || PID_FILE_PATH
+  end
+
+  # Set file name for batch process pid
+  def self.set_pid_file_name(str)
+    @pid_file[:name] = str if str.is_a?(String) && !is_blank?(str)
+  end
+
+  # Set file name for batch process pid
+  def set_pid_flag(flag=true)
+    flag = true if !flag.is_a?(TrueClass) && !flag.is_a?(FalseClass)
+    @pid_flag = flag
+  end
+
   # Initialize, next is parameters:
   # 1rst: task object or batch name(string) (Default parameter)
   # 2end: option (Influencing log size, file name format, etc.)
@@ -39,10 +94,9 @@ class ExtBatch
     @start_time     ||= Time.now
     @last_time      ||= @start_time
 
-
     @pid_flag = true
+    @@pid_file_path ||= PID_FILE_PATH # Prevent duplication after file sharing by multiple servers
     @pid_file = {
-        path: '',
         name: '',
         cmd: ''
     }
@@ -183,77 +237,6 @@ class ExtBatch
     return mail_tips(@log_name, opt)
   end
 
-  # Set file name for batch process pid
-  def set_pid_flag(flag=true)
-    flag = true if !flag.is_a?(TrueClass) && !flag.is_a?(FalseClass)
-    @pid_flag = flag
-  end
-
-  # Get file name for batch process pid
-  def get_pid_file_name
-    return @pid_file[:name]
-  end
-
-  # Set file path for batch process pid
-  def set_pid_file_path(str)
-    @pid_file[:path] = str if str.is_a?(String) && !is_blank?(str)
-  end
-
-  # Get file path for batch process pid
-  def get_pid_file_path
-    return @pid_file[:path]
-  end
-
-  # Set file name for batch process pid
-  def set_pid_file_name(str)
-    @pid_file[:name] = str if str.is_a?(String) && !is_blank?(str)
-  end
-
-  # Get file name for batch process pid
-  def get_pid_file_name
-    return @pid_file[:name]
-  end
-
-  # Get test for pid
-  def get_pid_test(opt={})
-
-# Everything
-#     ProcTable.ps{ |p|
-#       puts p.pid.to_s
-#       puts p.comm
-#       # ...
-#     }
-
-# Just one process
-#     s = ProcTable.ps(pid: 2123)
-#     puts s.pid.to_s
-#     puts s.comm
-# ...
-
-# Return the results as an array of ProcTableStructs
-    puts "@task_name ### #{@task_name}"
-
-    task_name = 'irb'
-    pid = ''
-    a = ProcTable.ps
-    a.each_with_index do |p, idx|
-      if p.cmdline.include?(task_name)
-        @ext_logger.info "pid:#{p.pid}, cmd:#{p.comm}, cmdline: #{p.cmdline}"
-        pid = p.pid
-        break
-      end
-      # puts "pid:#{p.pid}, cmd:#{p.comm}, cmdline: #{p.cmdline}" if p.cmdline.include?(@task_name)
-      # puts "p.class: #{p.class}"
-      # puts p.to_s
-      # break if idx >= 10
-      # ...
-    end
-
-    puts "#{task_name}.pid: #{pid}"
-
-    File.new()
-  end
-
   private
   # Private function for initialize
   # batch initialize
@@ -287,7 +270,7 @@ class ExtBatch
     end
 
     # Full log file name
-    log_path = rails_root + '/log/' + @log_name + '.log'
+    log_path = ExtLogger.rails_root + '/log/' + @log_name + '.log'
     mkdir_more(log_path)
     output_debug "#{func_name} Current log path: #{log_path}"
 
@@ -327,14 +310,13 @@ class ExtBatch
     set_pid_flag(opt[:pid_flag]) if !is_blank?(opt[:pid_flag])
     if @pid_flag
       @pid_file = {
-          path: rails_root + '/tmp/batch_pids/',  # Prevent duplication after file sharing by multiple servers
           name: @task_name.gsub(':', '#').gsub(' ', '_') + '.pid',
           cmd:  @task_name
       }
       create_pid_file
     end
 
-    message = "(#{rails_env}) #{@task_name} START"
+    message = "(#{ExtLogger.rails_env}) #{@task_name} START"
     @ext_logger.info message
   end
 
@@ -406,8 +388,8 @@ class ExtBatch
   # Create batch process pid file
   def create_pid_file
     func_name = "[#{get_class_name}:private #{__method__.to_s}]"
-    if !is_blank?(@pid_file[:name]) && !is_blank?(@pid_file[:path])
-      file_path = File.join(@pid_file[:path], @pid_file[:name])
+    if !is_blank?(@pid_file[:name]) && !is_blank?(@@pid_file_path)
+      file_path = File.join(@@pid_file_path, @pid_file[:name])
       @ext_logger.info "#{func_name} pid_file_path: #{file_path}"
 
       pid = nil
@@ -425,10 +407,10 @@ class ExtBatch
         # ...
       end
 
-
       if pid
         @ext_logger.info "#{func_name} #{@pid_file[:name]}.pid: #{pid}"
         mkdir_more(file_path)
+        File.delete(file_path) if File.exist?(file_path)
 
         File.open(file_path, 'w') do |f|
           f.write pid
@@ -444,8 +426,8 @@ class ExtBatch
   # Delete batch process pid file
   def delete_pid_file
     func_name = "[#{get_class_name}:private #{__method__.to_s}]"
-    if !is_blank?(@pid_file[:name]) && !is_blank?(@pid_file[:path])
-      file_path = File.join(@pid_file[:path], @pid_file[:name].gsub(' ', '_'))
+    if !is_blank?(@pid_file[:name]) && !is_blank?(@@pid_file_path)
+      file_path = File.join(@@pid_file_path, @pid_file[:name].gsub(' ', '_'))
 
       File.delete(file_path) if File.exist?(file_path)
     end

data/lib/ext_batch/version.rb

@@ -1,3 +1,3 @@
 module ExtBatch
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/templates/workers/ext_batch_monitor.rb

@@ -4,10 +4,11 @@ class ExtBatchMonitor
   sidekiq_options :retry => false
 
   def perform(*args)
+    include Sys
     batch_name = File.basename(__FILE__).gsub('.rb', '')
-    batch = ExtBatch.new(batch_name)
+    batch = ExtBatch.new(batch_name, pid_flag: false)
     begin
-
+      ExtBatch.monitor_pid_file(batch)
 
     rescue Exception => e
       batch.exception e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ext_batch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ruby
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: sidekiq-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: ext_logger
   requirement: !ruby/object:Gem::Requirement