diff lib/redmine/.svn/text-base/pop3.rb.svn-base @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/lib/redmine/.svn/text-base/pop3.rb.svn-base	Thu Jun 09 16:51:06 2011 +0100
+++ b/lib/redmine/.svn/text-base/pop3.rb.svn-base	Thu Jul 14 10:43:07 2011 +0100
@@ -27,30 +27,36 @@
         delete_unprocessed = (pop_options[:delete_unprocessed].to_s == '1')
 
         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|
           if pop_session.mails.empty?
-            puts "No email to process"
+            logger.debug "No email to process" if logger && logger.debug?
           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|
               message = msg.pop
               message_id = (message =~ /^Message-ID: (.*)/ ? $1 : '').strip
               if MailHandler.receive(message, options)
                 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
                 if delete_unprocessed
                   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
-                  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
+      
+      private
+
+      def logger
+        RAILS_DEFAULT_LOGGER
+      end
     end
   end
 end