Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3382 - Logging of email postmaster filter is to extensive with many more than 10 filters.

Browse source
This commit is contained in:
Martin Edenhofer 2021-01-21 10:48:05 +01:00 committed by Thorsten Eckel
parent 708b953d81
commit b50326fb20
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/channel/filter/database.rb
View file

@ -22,12 +22,16 @@ 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.info " matching #{key.downcase}:'#{value}' on #{match_rule}, but shoud not" Rails.logger.debug " not matching #{key.downcase}:'#{value}' contains not #{match_rule}"
else
Rails.logger.info " matching: #{key.downcase}:'#{value}' 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.info " not matching #{key.downcase}:'#{value}' on #{match_rule}, but should" Rails.logger.debug " not matching #{key.downcase}:'#{value}' contains #{match_rule}"
else
Rails.logger.info " matching #{key.downcase}:'#{value}' contains #{match_rule}"
end end
else else
all_matches_ok = false all_matches_ok = false