Maintenance: Reduced logging information of performed and matching postmaster filters.
This commit is contained in:
parent
396ed5d9f4
commit
bd8af1c402
|
@ -8,7 +8,7 @@ module Channel::Filter::Database
|
||||||
# process postmaster filter
|
# process postmaster filter
|
||||||
filters = PostmasterFilter.where(active: true, channel: 'email').order(:name, :created_at)
|
filters = PostmasterFilter.where(active: true, channel: 'email').order(:name, :created_at)
|
||||||
filters.each do |filter|
|
filters.each do |filter|
|
||||||
Rails.logger.info " process filter #{filter.name} ..."
|
Rails.logger.debug { " process filter #{filter.name} ..." }
|
||||||
all_matches_ok = true
|
all_matches_ok = true
|
||||||
min_one_rule_exists = false
|
min_one_rule_exists = false
|
||||||
filter[:match].each do |key, meta|
|
filter[:match].each do |key, meta|
|
||||||
|
@ -22,20 +22,20 @@ module Channel::Filter::Database
|
||||||
when 'contains not'
|
when 'contains not'
|
||||||
if value.present? && Channel::Filter::Match::EmailRegex.match(value: value, match_rule: match_rule)
|
if value.present? && Channel::Filter::Match::EmailRegex.match(value: value, match_rule: match_rule)
|
||||||
all_matches_ok = false
|
all_matches_ok = false
|
||||||
Rails.logger.debug " not matching #{key.downcase}:'#{value}' contains not #{match_rule}"
|
Rails.logger.debug { " not matching content '#{key.downcase}' contains not #{match_rule}" }
|
||||||
else
|
else
|
||||||
Rails.logger.info " matching: #{key.downcase}:'#{value}' contains not #{match_rule}"
|
Rails.logger.info { " matching: content '#{key.downcase}' contains not #{match_rule}" }
|
||||||
end
|
end
|
||||||
when 'contains'
|
when 'contains'
|
||||||
if value.blank? || !Channel::Filter::Match::EmailRegex.match(value: value, match_rule: match_rule)
|
if value.blank? || !Channel::Filter::Match::EmailRegex.match(value: value, match_rule: match_rule)
|
||||||
all_matches_ok = false
|
all_matches_ok = false
|
||||||
Rails.logger.debug " not matching #{key.downcase}:'#{value}' contains #{match_rule}"
|
Rails.logger.debug { " not matching content '#{key.downcase}' contains #{match_rule}" }
|
||||||
else
|
else
|
||||||
Rails.logger.info " matching #{key.downcase}:'#{value}' contains #{match_rule}"
|
Rails.logger.info { " matching content '#{key.downcase}' contains #{match_rule}" }
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
all_matches_ok = false
|
all_matches_ok = false
|
||||||
Rails.logger.info " Invalid operator in match #{meta.inspect}"
|
Rails.logger.info { " Invalid operator in match #{meta.inspect}" }
|
||||||
end
|
end
|
||||||
break if !all_matches_ok
|
break if !all_matches_ok
|
||||||
rescue => e
|
rescue => e
|
||||||
|
@ -51,7 +51,7 @@ module Channel::Filter::Database
|
||||||
filter[:perform].each do |key, meta|
|
filter[:perform].each do |key, meta|
|
||||||
next if !Channel::EmailParser.check_attributes_by_x_headers(key, meta['value'])
|
next if !Channel::EmailParser.check_attributes_by_x_headers(key, meta['value'])
|
||||||
|
|
||||||
Rails.logger.info " perform '#{key.downcase}' = '#{meta.inspect}'"
|
Rails.logger.debug { " perform '#{key.downcase}' = '#{meta.inspect}'" }
|
||||||
|
|
||||||
if key.casecmp('x-zammad-ticket-tags').zero? && meta['value'].present? && meta['operator'].present?
|
if key.casecmp('x-zammad-ticket-tags').zero? && meta['value'].present? && meta['operator'].present?
|
||||||
mail[ 'x-zammad-ticket-tags'.downcase.to_sym ] ||= []
|
mail[ 'x-zammad-ticket-tags'.downcase.to_sym ] ||= []
|
||||||
|
|
Loading…
Reference in a new issue