diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/exim_log.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb index e3be1805f..4e50c1839 100644 --- a/app/models/exim_log.rb +++ b/app/models/exim_log.rb @@ -54,8 +54,7 @@ class EximLog < ActiveRecord::Base done.save! f = is_gz ? Zlib::GzipReader.open(file_name) : File.open(file_name, 'r') - type = detect_mta_log_type(f) - case(type) + case(Configuration::mta_log_type.to_sym) when :exim load_exim_log_data(f, done) when :postfix @@ -66,13 +65,6 @@ class EximLog < ActiveRecord::Base end end - # Unbelievably dumb heuristic for detecting whether this is an exim or a postfix log - def EximLog.detect_mta_log_type(f) - r = (f.readline =~ /postfix/) ? :postfix : :exim - f.rewind - r - end - # Scan the file def EximLog.load_exim_log_data(f, done) order = 0 |