Make POP3 mail fetcher log messages instead of puts (#7177).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4737 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
ea7224a461
commit
36a12aab9e
|
@ -27,30 +27,36 @@ module Redmine
|
||||||
delete_unprocessed = (pop_options[:delete_unprocessed].to_s == '1')
|
delete_unprocessed = (pop_options[:delete_unprocessed].to_s == '1')
|
||||||
|
|
||||||
pop = Net::POP3.APOP(apop).new(host,port)
|
pop = Net::POP3.APOP(apop).new(host,port)
|
||||||
puts "Connecting to #{host}..."
|
logger.debug "Connecting to #{host}..." if logger && logger.debug?
|
||||||
pop.start(pop_options[:username], pop_options[:password]) do |pop_session|
|
pop.start(pop_options[:username], pop_options[:password]) do |pop_session|
|
||||||
if pop_session.mails.empty?
|
if pop_session.mails.empty?
|
||||||
puts "No email to process"
|
logger.debug "No email to process" if logger && logger.debug?
|
||||||
else
|
else
|
||||||
puts "#{pop_session.mails.size} email(s) to process..."
|
logger.debug "#{pop_session.mails.size} email(s) to process..." if logger && logger.debug?
|
||||||
pop_session.each_mail do |msg|
|
pop_session.each_mail do |msg|
|
||||||
message = msg.pop
|
message = msg.pop
|
||||||
message_id = (message =~ /^Message-ID: (.*)/ ? $1 : '').strip
|
message_id = (message =~ /^Message-ID: (.*)/ ? $1 : '').strip
|
||||||
if MailHandler.receive(message, options)
|
if MailHandler.receive(message, options)
|
||||||
msg.delete
|
msg.delete
|
||||||
puts "--> Message #{message_id} processed and deleted from the server"
|
logger.debug "--> Message #{message_id} processed and deleted from the server" if logger && logger.debug?
|
||||||
else
|
else
|
||||||
if delete_unprocessed
|
if delete_unprocessed
|
||||||
msg.delete
|
msg.delete
|
||||||
puts "--> Message #{message_id} NOT processed and deleted from the server"
|
logger.debug "--> Message #{message_id} NOT processed and deleted from the server" if logger && logger.debug?
|
||||||
else
|
else
|
||||||
puts "--> Message #{message_id} NOT processed and left on the server"
|
logger.debug "--> Message #{message_id} NOT processed and left on the server" if logger && logger.debug?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def logger
|
||||||
|
RAILS_DEFAULT_LOGGER
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue