bizside 2.0.4 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01c25b82f7e799120dfb307b7a1ef14e24bc32cc518f2c7fabe6cc84c843987
-  data.tar.gz: f1e3f4ad2264d5105b2661368290a3483d456b96d60c5a5ffc8cf27308131fd6
+  metadata.gz: f00dba55e99db77fad3ddfe68afb706b89fe3bdc718ad774613309c3bebb7d7e
+  data.tar.gz: 16be628bb79ff1689956d1f63f0895559775531b74d80270d7edb6239ef9abf3
 SHA512:
-  metadata.gz: e13784ada4cf0e8a8a70358529bcd1782787db4861adccbe8dc89cd57e17b42370071741e138b47b1515b0bb125e7846668c6cc4e08aac962a249f9e86a5d6aa
-  data.tar.gz: abcb24b074417f8d90a04c6f80e9024a9ae6cb91cb9dc44ff197628ccc5234865b362d51037a604a933c59883475fc3e88cb4a519b727db1f0d668add4fb96db
+  metadata.gz: a2c0f432bd5d53b537f9db6b3a7f28a9f0c747b9eb0a49ec0838ec02ecfbdedc902d36bda002581d82cbaf5513f0177d5ac57fa229604fde0516bf729b1df9fb
+  data.tar.gz: b28b49b0f10c14bedf018a61d938465de5a95d4a8884a9721bf25291c08eec807e2017bad15d6d1594a4f0c82c971b3d70ee1d63502ad94ace3a6000f9ff54ea

data/lib/bizside/config.rb

@@ -25,7 +25,7 @@ module Bizside
 
       ret
     end
-    
+
     def []=(key, value)
       value = self.class.new(value) if value.is_a?(Hash)
       @hash[key.to_s] = value
@@ -52,8 +52,10 @@ module Bizside
     def method_missing(name, *args)
       ret = self[name]
 
-      if ret.is_a?(Hash) and not args[0].nil?
-        ret = args[0]
+      if ret.is_a?(Hash) || ret.is_a?(::Bizside::Config)
+        unless args[0].nil?
+          ret = self[name] = args[0]
+        end
       end
 
       ret

data/lib/bizside/file_uploader.rb

@@ -4,12 +4,7 @@ require_relative 'carrierwave'
 require_relative 'uploader/extension_whitelist'
 require_relative 'uploader/filename_validator'
 require_relative 'uploader/content_type_validator'
-
-if defined?(Rails) && Rails.application.class.parent_name.eql?('BizsideTestApp')
-  # not require 'uploader/exif'
-else
-  require_relative 'uploader/exif'
-end
+require_relative 'uploader/exif'
 
 module Bizside
   # === storage.yml
@@ -45,6 +40,21 @@ module Bizside
       Bizside.config.storage.fog? ? downloaded_file_from_fog(file.path) : file.path
     end
 
+    # ファイル名の長さチェックが可能なように
+    def cache!(new_file = sanitized_file)
+      begin
+        super
+      rescue Errno::ENAMETOOLONG => e
+        if Bizside.config.file_uploader.ignore_long_filename_error?
+          if self.model.respond_to?(:original_filename)
+            self.model.original_filename = filename
+          end
+        else
+          raise e
+        end
+      end
+    end
+
     private
 
     def downloaded_file_from_fog(path)

data/lib/bizside/job_utils.rb

@@ -47,6 +47,41 @@ module Bizside
       end
     end
 
+    def self.enqueue_at_with_queue(queue, time, klass, *args)
+      if Bizside.rails_env&.test?
+        if klass.respond_to?(:before_enqueue)
+          return unless klass.before_enqueue(*args)
+        end
+
+        Bizside.logger.info "テスト時には遅延ジョブの登録を行わず、即時実行します。"
+        klass.perform(*args)
+        return
+      end
+
+      if block_given?
+        yield
+      else
+        Bizside.logger.info "遅延ジョブ #{klass} を #{queue} に登録します。"
+      end
+
+      ::Resque.enqueue_at_with_queue(queue, time, klass, *args)
+    end
+
+    def self.enqueue_at_with_queue_silently(queue, time, klass, *args)
+      enqueue_at_with_queue(queue, time, klass, *args) do
+        # 何も出力しない
+      end
+    end
+
+    def self.remove_delayed_in_queue(klass, queue, *args)
+      if Bizside.rails_env&.test?
+        Rails.logger.info "テスト時には遅延ジョブのキャンセルを行いません。"
+        return
+      end
+
+      ::Resque.remove_delayed_in_queue(klass, queue, *args)
+    end
+
     def self.set_job_at(time, klass, *args)
       if Bizside.rails_env&.test?
         if klass.respond_to?(:before_enqueue)

data/lib/bizside/resque.rb

@@ -121,6 +121,7 @@ module Resque
         info = {
           time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
           add_on_name: Bizside.config.add_on_name,
+          server_address: hostname,
           class: payload['class'],
           args: payload['args'].to_s,
           queue: queue,
@@ -132,6 +133,19 @@ module Resque
         info
       end
 
+      # ホスト名を取得。
+      #
+      # 下記理由から hostname(1) を使用:
+      #
+      # * job 実行環境では環境変数 HOSTNAME がセットされていないケースがある
+      #   (例: 通常の god 起動の場合。他方、container 起動の場合は
+      #   HOSTNAME がセットされている模様)。
+      # * hostname(1) は Linux Standard Base 共通コマンドのため必ず存在する。
+      #   @see https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Common/LSB-Common/rcommands.html
+      def hostname
+        @hostname ||= (`hostname`.chomp rescue '(unknown)')
+      end
+
     end
   end
 end

data/lib/bizside/resque.rb.bkp

@@ -0,0 +1,161 @@
+module Bizside
+  module Resque
+  end
+end
+
+require 'resque'
+require 'resque/worker'
+require 'resque/failure/base'
+require 'resque/failure/multiple'
+require 'resque/failure/redis'
+require_relative 'audit/job_logger'
+
+{
+  yaml: ['config/resque.yml', 'config/redis.yml'],
+  json: ['config/resque.json', 'config/redis.json']
+}.each do |format, file_candidates|
+  file_candidates.each do |file|
+    resque_file = File.join(File.expand_path(ENV['RAILS_ROOT'] || '.'), file)
+    next unless File.exist?(resque_file)
+
+    resque_config = ERB.new(File.read(resque_file), 0, '-').result
+  
+    case format
+    when :yaml
+      Resque.redis = YAML.load(resque_config)[Bizside.env]
+      break
+    when :json
+      Resque.redis = ActiveSupport::JSON.decode(resque_config)[Bizside.env]
+      break
+    else
+      raise "不正なResque設定ファイルです。#{file}"
+    end
+  end
+end
+
+Resque.redis.namespace = "resque:#{Bizside.config.add_on_name}:#{Bizside.env}"
+
+if defined?(Resque::Scheduler)
+  Resque::Scheduler.dynamic = true
+end
+
+# tmp/stop.txt が存在する場合は一時停止する
+module Resque
+  class Worker
+
+    alias_method :reserve_without_stop_txt, :reserve
+
+    def reserve
+      stop_file_path = File.join('tmp', 'stop.txt')
+      if File.exist?(stop_file_path)
+       puts "#{Resque.redis.namespace} #{stop_file_path} が存在するため一時停止します。"
+       nil
+      else
+        reserve_without_stop_txt
+      end
+    end
+
+  end
+end
+
+# resque-webのエラーメッセージ文字化けに対するパッチ
+module Resque
+  module Failure
+    class Redis
+
+      def save
+        data = {
+          :failed_at => UTF8Util.clean(Time.now.strftime("%Y/%m/%d %H:%M:%S %Z")),
+          :payload   => payload,
+          :exception => exception.class.to_s,
+          :error     => exception.to_s, #UTF8Util.clean(exception.to_s), UTF8Util.cleanを呼ぶと文字化けする
+          :backtrace => filter_backtrace(Array(exception.backtrace)),
+          :worker    => worker.to_s,
+          :queue     => queue
+        }
+        data = Resque.encode(data)
+        Resque.redis.rpush(:failed, data)
+      end
+
+    end
+  end
+end
+
+# エラーをログに出力
+module Resque
+  module Failure
+    class LogOutput < Base
+      def save
+        Bizside.logger.error [
+          "[FATAL] Resque #{queue}:#{worker}",
+          "#{payload}",
+          "#{exception.class} #{exception.to_s}",
+          "#{Array(exception.backtrace).join("\n")}"
+        ].join("\n")
+      end
+    end
+  end
+end
+
+# エラーをLTSV形式で専用ログに出力
+module Resque
+  module Failure
+    class JobAuditLog < Base
+
+      def save
+        dump_env
+        info = build_loginfo
+        return info if Bizside.rails_env&.test?
+  
+        logger.record(info)
+  
+        info
+      end
+
+      private
+
+      def logger
+        @logger ||= Bizside::Audit::JobLogger.logger
+      end
+
+      def build_loginfo
+        info = {
+          time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
+          add_on_name: Bizside.config.add_on_name,
+          server_address: hostname,
+          class: payload['class'],
+          args: payload['args'].to_s,
+          queue: queue,
+          worker: worker.to_s,
+          exception: exception.class,
+          exception_message: exception.to_s,
+          exception_backtrace: Array(exception.backtrace)[0..10].join("\n") # Get only the top 10 because there are many traces.
+        }
+        info
+      end
+
+
+      def dump_env
+        File.open('/tmp/resque-dump.log', 'a') do |f|
+          f.puts('== begin')
+          for k, v in ENV do
+            f.printf("%30s %s\n", k, v)
+          end
+          f.puts('')
+        end
+      end
+
+      # hostname(1) からホスト名を取得。
+      #
+      # job 実行環境(コンテナ等)では環境変数(HOSTNAME等)にホスト名はセットされていない。
+      def hostname
+        @hostname ||= (`hostname`.chomp rescue '(unknown)')
+      end
+
+    end
+  end
+end
+
+Resque::Failure::Multiple.configure do |multi|
+  multi.classes = [Resque::Failure::Redis, Resque::Failure::LogOutput, Resque::Failure::JobAuditLog]
+end

data/lib/bizside/resque.rb~

@@ -0,0 +1,154 @@
+module Bizside
+  module Resque
+  end
+end
+
+require 'resque'
+require 'resque/worker'
+require 'resque/failure/base'
+require 'resque/failure/multiple'
+require 'resque/failure/redis'
+require_relative 'audit/job_logger'
+
+{
+  yaml: ['config/resque.yml', 'config/redis.yml'],
+  json: ['config/resque.json', 'config/redis.json']
+}.each do |format, file_candidates|
+  file_candidates.each do |file|
+    resque_file = File.join(File.expand_path(ENV['RAILS_ROOT'] || '.'), file)
+    next unless File.exist?(resque_file)
+
+    resque_config = ERB.new(File.read(resque_file), 0, '-').result
+  
+    case format
+    when :yaml
+      Resque.redis = YAML.load(resque_config)[Bizside.env]
+      break
+    when :json
+      Resque.redis = ActiveSupport::JSON.decode(resque_config)[Bizside.env]
+      break
+    else
+      raise "不正なResque設定ファイルです。#{file}"
+    end
+  end
+end
+
+Resque.redis.namespace = "resque:#{Bizside.config.add_on_name}:#{Bizside.env}"
+
+if defined?(Resque::Scheduler)
+  Resque::Scheduler.dynamic = true
+end
+
+# tmp/stop.txt が存在する場合は一時停止する
+module Resque
+  class Worker
+
+    alias_method :reserve_without_stop_txt, :reserve
+
+    def reserve
+      stop_file_path = File.join('tmp', 'stop.txt')
+      if File.exist?(stop_file_path)
+       puts "#{Resque.redis.namespace} #{stop_file_path} が存在するため一時停止します。"
+       nil
+      else
+        reserve_without_stop_txt
+      end
+    end
+
+  end
+end
+
+# resque-webのエラーメッセージ文字化けに対するパッチ
+module Resque
+  module Failure
+    class Redis
+
+      def save
+        data = {
+          :failed_at => UTF8Util.clean(Time.now.strftime("%Y/%m/%d %H:%M:%S %Z")),
+          :payload   => payload,
+          :exception => exception.class.to_s,
+          :error     => exception.to_s, #UTF8Util.clean(exception.to_s), UTF8Util.cleanを呼ぶと文字化けする
+          :backtrace => filter_backtrace(Array(exception.backtrace)),
+          :worker    => worker.to_s,
+          :queue     => queue
+        }
+        data = Resque.encode(data)
+        Resque.redis.rpush(:failed, data)
+      end
+
+    end
+  end
+end
+
+# エラーをログに出力
+module Resque
+  module Failure
+    class LogOutput < Base
+      def save
+        Bizside.logger.error [
+          "[FATAL] Resque #{queue}:#{worker}",
+          "#{payload}",
+          "#{exception.class} #{exception.to_s}",
+          "#{Array(exception.backtrace).join("\n")}"
+        ].join("\n")
+      end
+    end
+  end
+end
+
+# エラーをLTSV形式で専用ログに出力
+module Resque
+  module Failure
+    class JobAuditLog < Base
+
+      def save
+        info = build_loginfo
+        return info if Bizside.rails_env&.test?
+  
+        logger.record(info)
+  
+        info
+      end
+
+      private
+
+      def logger
+        @logger ||= Bizside::Audit::JobLogger.logger
+      end
+
+      def build_loginfo
+        info = {
+          time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
+          add_on_name: Bizside.config.add_on_name,
+          server_address: hostname,
+          class: payload['class'],
+          args: payload['args'].to_s,
+          queue: queue,
+          worker: worker.to_s,
+          exception: exception.class,
+          exception_message: exception.to_s,
+          exception_backtrace: Array(exception.backtrace)[0..10].join("\n") # Get only the top 10 because there are many traces.
+        }
+        info
+      end
+
+      # ホスト名を取得。
+      #
+      # 下記理由から hostname(1) を使用:
+      #
+      # * job 実行環境では環境変数 HOSTNAME がセットされていないケースがある
+      #   (例: 通常の god 起動の場合。他方、container 起動の場合は
+      #   HOSTNAME がセットされている模様)。
+      # * hostname(1) は Linux Standard Base 共通コマンドのため必ず存在する。
+      def hostname
+        @hostname ||= (`hostname`.chomp rescue '(unknown)')
+      end
+
+    end
+  end
+end
+
+Resque::Failure::Multiple.configure do |multi|
+  multi.classes = [Resque::Failure::Redis, Resque::Failure::LogOutput, Resque::Failure::JobAuditLog]
+end

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '2.0.4'
+  VERSION = '2.0.7'
 end

data/lib/bizside/version.rb~

@@ -0,0 +1,3 @@
+module Bizside
+  VERSION = '2.0.6.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.7
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -419,6 +419,8 @@ files:
 - lib/bizside/railtie.rb
 - lib/bizside/record_has_warnings.rb
 - lib/bizside/resque.rb
+- lib/bizside/resque.rb.bkp
+- lib/bizside/resque.rb~
 - lib/bizside/rsync.rb
 - lib/bizside/safe_pty.rb
 - lib/bizside/shib_utils.rb
@@ -441,6 +443,7 @@ files:
 - lib/bizside/user_agent/controller_helper.rb
 - lib/bizside/validations.rb
 - lib/bizside/version.rb
+- lib/bizside/version.rb~
 - lib/bizside/view_helper.rb
 - lib/bizside/warning.rb
 - lib/bizside/yes.rb
@@ -479,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.29
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.