ext_batch 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161f89b793ce8e0c47982974ae4ce6a871ebbb34
-  data.tar.gz: bafb5ea1e0f452fbc4e69a95e1b67a7a3e90d24e
+  metadata.gz: 52aeecd3a82748aa907ad6d5f3ca59df5570b8da
+  data.tar.gz: 518adee2c3a7c4375ebb42b0c5eecb8497396c9c
 SHA512:
-  metadata.gz: 2803a11495151399f2fc7b50d7a4a22c9a925a5549c892f5489a9d39f45f540d55b1b220c7a41f5ec84bc7097895facc1466c6fabe21f4617c3c2abb30d757ec
-  data.tar.gz: fcaa5df84a98c00f184a925da462a1a9c567e7582f3775eeacbcc08e054bc8d249d5a11b4fd2de1e21efee44db872246c96ac13c1b52aa069ee88860bcd05117
+  metadata.gz: 62639aba2fa865b6c03856195a3009de2485930da664bc47da1a49c2606fba5e29bbba217943f79b966e990ae78816dce7c48f0ebd9178eb123669cad0d47bc8
+  data.tar.gz: b4c3aff281e9ee23e0bda9aebf97da56fb9b3216a94f8d532c958b67aad44eec6ea0bd553f5d346fce17c3ec39175a4ca1f0762e25f8ae0347f78c8900f51c6b

data/README.md

@@ -5,7 +5,7 @@ Welcome to your new gem! In this directory, you'll find the files you need to be
 ```explain
 Extended the ext_logger gem package, services for Ruby batch and Ruby rake. 
 Other extensions see version updates.
-2019-01-20(0.1.0):
+2019-01-20(0.1.1):
     dependency: ext_logger ~> v0.2
     
 

data/lib/ext_batch/main.rb

@@ -39,9 +39,12 @@ class ExtBatch
     @start_time     ||= Time.now
     @last_time      ||= @start_time
 
+
+    @pid_flag = true
     @pid_file = {
         path: '',
-        name: ''
+        name: '',
+        cmd: ''
     }
 
     init(args[0]) if args.size == 1
@@ -93,7 +96,7 @@ class ExtBatch
     # opt[:show_use_time] = true if opt[:show_use_time] != false
     message += get_total_time(@start_time) #if opt[:show_use_time]
 
-    delete_pid_file
+    delete_pid_file if @pid_flag
     @ext_logger.info message
     @ext_logger.record_memory('end') if defined?(@ext_logger.record_memory)
   end
@@ -125,6 +128,7 @@ class ExtBatch
 
   # Inheriting ExtLogger instance method: info
   def exception(e, opt={})
+    opt = {} if !opt.is_a?(Hash)
     opt[:send_mail] ||= SEND_MAIL_NO
     opt[:status]    = LABEL_ERROR
     content = []
@@ -142,6 +146,7 @@ class ExtBatch
   # batch: send ok mail
   def mail_ok(opt={})
     func_name = "[#{get_instance_name}.#{__method__.to_s}]"
+    opt = {} if !opt.is_a?(Hash)
     opt[:content] ||= ''
     opt[:status] = LABEL_OK
     return mail_tips(@log_name, opt)
@@ -150,6 +155,7 @@ class ExtBatch
   # batch: send error mail
   def mail_error(opt={})
     func_name = "[#{get_instance_name}.#{__method__.to_s}]"
+    opt = {} if !opt.is_a?(Hash)
     opt[:content] ||= ''
     opt[:status] = LABEL_ERROR
     return mail_tips(@log_name, opt)
@@ -158,6 +164,7 @@ class ExtBatch
   # batch: send warning mail
   def mail_warn(opt={})
     func_name = "[#{get_instance_name}.#{__method__.to_s}]"
+    opt = {} if !opt.is_a?(Hash)
     opt[:content] ||= ''
     opt[:status] = LABEL_WARN
     return mail_tips(@log_name, opt)
@@ -176,6 +183,17 @@ 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)
@@ -306,11 +324,15 @@ class ExtBatch
       @batch_message += opt[:message]
     end
 
-    @pid_file = {
-        path: rails_root + '/tmp/batch_pids/',  # Prevent duplication after file sharing by multiple servers
-        name: @task_name
-    }
-    create_pid_file
+    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"
     @ext_logger.info message
@@ -385,12 +407,13 @@ class ExtBatch
   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].gsub(' ', '_'))
+      file_path = File.join(@pid_file[:path], @pid_file[:name])
+      @ext_logger.info "#{func_name} pid_file_path: #{file_path}"
 
       pid = nil
       a = ProcTable.ps
       a.each_with_index do |p, idx|
-        if p.cmdline.include?(@pid_file[:name])
+        if p.cmdline.include?(@pid_file[:cmd])
           @ext_logger.info "pid:#{p.pid}, cmd:#{p.comm}, cmdline: #{p.cmdline}"
           pid = p.pid
           break
@@ -404,7 +427,7 @@ class ExtBatch
 
 
       if pid
-        @ext_logger.info "#{func_name} #{@pid_file[:name]}.pid:#{pid}, pid_file_path:#{file_path}"
+        @ext_logger.info "#{func_name} #{@pid_file[:name]}.pid: #{pid}"
         mkdir_more(file_path)
 
         File.open(file_path, 'w') do |f|

data/lib/ext_batch/version.rb

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

data/lib/templates/workers/ext_batch_monitor.rb

@@ -1,34 +1,17 @@
-class BitflyerFxPairWorker
+class ExtBatchMonitor
+  require 'ext_batch'
   include Sidekiq::Worker
   sidekiq_options :retry => false
 
   def perform(*args)
-    # 这个worker取bitFlyer的FX数据
-    # 只显示在BTC_JPY的页面
-    # 只存入redis
-    logger = TickApi.new_logger(File.basename(__FILE__).gsub('.rb', ''))
+    batch_name = File.basename(__FILE__).gsub('.rb', '')
+    batch = ExtBatch.new(batch_name)
     begin
-      pair_code = 'fx_btc_jpy'
-      Yml::TICK_API[:pair][pair_code].each do |item|
-        company = Yml::TICK_API[:company][item]
-        next if company.blank?
 
-        code = company[:code][pair_code]
-        code = pair_code if code == ''
 
-        # 请求api
-        json = TickApi.get_tick_data(company[:api], code, {logger: logger})
-        return if json.blank?
-
-        # 保存到缓存
-        # 数据存入到btc_jpy的key里面用于tick.coffee实时更新
-        TickApi.save_tick_cache('btc_jpy', item, json, {logger: logger})
-        # 数据存入到fx_btc_jpy的key里面用于页面刷新
-        ticks = TickApi.save_tick_cache(pair_code, item, json, {logger: logger})
-        logger.info "[main]#{pair_code} ### worker done." if !ticks.blank?
-      end
     rescue Exception => e
-      logger.error e.message
+      batch.exception e
     end
+    batch.end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ext_batch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ruby