bizside 2.3.5 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c3eab65480a846426f4015353ed1617dfd60ed6a87c66f484a71a04f5ff6b5
-  data.tar.gz: a844984d53df0fd9f8dbd044f9d0378b9cb86c0cd51ede77b2aacdd75d3ec41c
+  metadata.gz: 3e862771bbdfb64ff2afb022531b1250695b8741628eeefbb1e3b04df397cdda
+  data.tar.gz: e1d399959f57b304de4decd054d21d45e9918bdd8f04a6f78f14e6aa53132827
 SHA512:
-  metadata.gz: ac71e3cd39adb06862d2e8ca9d4d6bf3478989dcbc72c5477e24530a825e27fd39cd3c120bf19e6593026529da68e040c0742b4a4f9b03fd31707073ed829911
-  data.tar.gz: 03236ce54e54d9aa71a71c6af0b63a340797045badd69c175f78e4c8d2fb5c38635b894e466c5a223b2c40a231c519477b420f8b4286b7129790f562a9f51a42
+  metadata.gz: d047094b8f553a82da8ddc19b76dad83cf53b75241614fa29a52213d14d2cb2c20bf1f889f5b663dbc0c56889b40a65c314fa51f89605bae429c79f18359357f
+  data.tar.gz: e79df9ac71b7c9d7e3bc6df57108fdefadbc9a43bfe5b45181b736880f57c757a3006e9596b336c7418b1fe2e9041467b769de11dfb0b5dd83d4f466a14866c7

data/lib/bizside/cron_validator.rb

@@ -30,7 +30,7 @@ module Bizside
 
         def valid_#{attr}?
           valid_format?(@#{attr}) &&
-          valid_range?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
+          valid_range_and_step?(MIN_#{attr.upcase}, MAX_#{attr.upcase}, @#{attr})
         end
       EOS
     end
@@ -41,22 +41,40 @@ module Bizside
       value =~ /\A(\*(\/\d+)?|\d+(,\d+)*(-\d+)*(\/\d+)*)\Z/
     end
 
+    def valid_range_and_step?(min, max, value)
+      valid_range?(min, max, value) && valid_step?(min, max, value)
+    end
+
     def valid_range?(min, max, value)
-      validate_values = remove_to_ignore_value(value).split(",")
-      validate_values.reject do |v|
+      range_values = get_range_value(value).split(",")
+      range_values.reject do |v|
         if v.include?("-")
           range_v = v.split("-")
           (min..max).include?(range_v[0].to_i) &&
           (min..max).include?(range_v[1].to_i) &&
           range_v[0].to_i < range_v[1].to_i
         else
-          (min..max).include? v.to_i
+          (min..max).include?(v.to_i)
         end
       end.empty?
     end
 
-    def remove_to_ignore_value(value)
+    def valid_step?(min, max, value)
+      v = get_step_value(value)
+      return true if v.empty?
+
+      v != '*' &&
+      v.to_i != 0 &&
+      (min..max).include?(v.to_i)
+    end
+
+    def get_range_value(value)
       value.gsub(/(\/\d*|\*)/, "")
     end
+
+    def get_step_value(value)
+      return "" unless value.include?('/')
+      value.gsub(/.*\/(.*)/) { $1 }
+    end
   end
 end

data/lib/bizside/job_utils.rb

@@ -173,9 +173,11 @@ module Bizside
       if cronline.to_s.strip.empty?
         return
       elsif CronValidator.new(cronline).valid?
+        new_cron = set_cron_options(cron)
+
         config = {
           :class => job_type,
-          :cron => cron,
+          :cron => new_cron,
           :args => args,
           :persist => true
         }
@@ -404,5 +406,19 @@ module Bizside
     end
     private_class_method :do_perform_and_hooks_instantly
 
+    def self.set_cron_options(cron)
+      ret = Array(cron)
+      if ret.size > 1
+        opts = ret.second
+        opts ||= {}
+        opts = opts.with_indifferent_access
+        opts = opts.merge(blocking: true)
+      else
+        opts = { blocking: true }.with_indifferent_access
+      end
+      ret[1] = opts
+      ret
+    end
+
   end
 end

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.3.5'
+  VERSION = '2.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.7
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -413,7 +413,6 @@ files:
 - lib/bizside/implicit_ftps.rb
 - lib/bizside/itamae_conf.rb
 - lib/bizside/job_utils.rb
-- lib/bizside/log_analyzer.rb
 - lib/bizside/mailer.rb
 - lib/bizside/query_builder.rb
 - lib/bizside/railtie.rb
@@ -476,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.

data/lib/bizside/log_analyzer.rb

@@ -1,122 +0,0 @@
-module Bizside
-  class LogAnalyzer
-    attr_reader :add_on_name
-    attr_reader :error_contents
-
-    def initialize(add_on_name, files)
-      @add_on_name = add_on_name
-      @files = files
-    end
-
-    def analyze(output_file_name)
-      @success =  system("request-log-analyzer --format rails3 --parse-strategy cautious --file #{output_file_name}.html --output HTML #{@files.join(' ')}")
-    end
-
-    def success?
-      @success
-    end
-
-    def scrape_errors
-      @error_content = String.new
-      @error_contents = {}
-
-      # TODO Okozeを解析できるようにする
-      return if add_on_name == 'okoze'
-
-      # TODO ログ内で重複したエラーメッセージを除外する
-      return if ['amadai', 'webcam_api', 'seri', 'sushioke'].include?(add_on_name)
-
-      @files.each do |file|
-        content = File.read(file, encoding: 'utf-8')
-        content = content.encode('UTF-16BE', 'UTF-8', :invalid => :replace, :undef => :replace, :replace => '?').encode('UTF-8')
-        next unless content.include?('Completed 500') or content.include?('FATAL')
-
-        # ログをプロセス単位に分割
-        partition_contents = divide_into_pid(content)
-        # プロセス単位に分割したログからエラーを抽出
-        partition_content_errors = extract_error_log(partition_contents)
-        # 抽出したエラーを出力用にまとめる
-        partition_content_errors.each do |pid, pc|
-          @error_contents[pid] = "#{file}のエラー抽出結果\n\n\n" if @error_contents[pid].nil? or @error_contents[pid].empty?
-          @error_contents[pid] << pc
-        end
-
-        @error_contents
-      end
-    end
-
-    def divide_into_pid(content)
-      pid = nil
-      ret = {}
-      content.each_line do |c|
-        s = c.scan(/#[0-9]+\]/)
-        pid = s.first.scan(/[0-9]+/).first unless s.empty?
-        ret[pid] = "" unless ret[pid]
-        ret[pid] << c
-      end
-
-      ret
-    end
-
-    def extract_error_log(partition_contents)
-      ret = {}
-      partition_contents.each do |pid, pc|
-        tmp = ""
-        pc.each_line do |line|
-          unless line.scan(/: Started /).empty?
-            if !tmp.scan(/Completed 500/).empty? or !tmp.scan(/\] FATAL/).empty? or !tmp.scan(/\[FATAL\]/).empty?
-              ret[pid] = "" if ret[pid].nil? or ret[pid].empty?
-              ret[pid] << tmp
-            end
-            tmp.clear
-          end
-          tmp << exclude_error_log_line(line)
-        end
-
-        # Startedの前にログが終了した場合、その時点までにエラーが含まれていれば抽出に含める
-        if !tmp.empty? and !tmp.scan(/Completed 500/).empty? or !tmp.scan(/\] FATAL/).empty? or !tmp.scan(/\[FATAL\]/).empty?
-          ret[pid] = "" if ret[pid].nil? or ret[pid].empty?
-          ret[pid] << tmp
-        end
-        tmp.clear
-      end
-
-      ret
-    end
-
-    def exclude_error_log_line(line)
-      ret = nil
-      ret = line.match("INFO -- : ジョブ.*登録します。")
-
-      if ret.nil?
-        line
-      else
-        ""
-      end
-    end
-
-    # TODO 重複したエラーログを除外する
-    def get_duplicate_check_line(line)
-      ret = line.scan(/(INFO -- :.*|ERROR -- :.*|WARN -- :.*|FATAL -- :.*)/).first
-      ret = ret.gsub(/\" for .*/, "\"") unless ret.nil or ret.empty?
-
-      ret
-    end
-
-    # TODO 重複したエラーログを除外する
-    def duplicate_error_log?(extract_error_logs, duplicate_check_lines)
-      res = false
-      extract_error_logs.each do |eer|
-        tmp = false
-        duplicate_check_lines.each do |dcl|
-          tmp = eer.include?(dcl)
-          break unless tmp
-        end
-        res = tmp
-        break if res
-      end
-
-      res
-    end
-  end
-end