jro_apps/redmine Commit - r9529:e7b9a9c6ff43

Replace RAILS_DEFAULT_LOGGER with ::Rails.logger (#11013)....

Jean-Philippe Lang -

r9529:e7b9a9c6ff43

parent child

Context file:

r9529:e7b9a9c6ff43

Collapse all files

lib/redmine/imap.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'net/imap'
              module Redmine
                module IMAP
                  class << self
                    def check(imap_options={}, options={})
                      host = imap_options[:host] || '127.0.0.1'
                      port = imap_options[:port] || '143'
                      ssl = !imap_options[:ssl].nil?
                      folder = imap_options[:folder] || 'INBOX'
                      imap = Net::IMAP.new(host, port, ssl)
                      imap.login(imap_options[:username], imap_options[:password]) unless imap_options[:username].nil?
                      imap.select(folder)
                      imap.search(['NOT', 'SEEN']).each do |message_id|
                        msg = imap.fetch(message_id,'RFC822')[0].attr['RFC822']
                        logger.debug "Receiving message #{message_id}" if logger && logger.debug?
                        if MailHandler.receive(msg, options)
                          logger.debug "Message #{message_id} successfully received" if logger && logger.debug?
                          if imap_options[:move_on_success]
                            imap.copy(message_id, imap_options[:move_on_success])
                          end
                          imap.store(message_id, "+FLAGS", [:Seen, :Deleted])
                        else
                          logger.debug "Message #{message_id} can not be processed" if logger && logger.debug?
                          imap.store(message_id, "+FLAGS", [:Seen])
                          if imap_options[:move_on_failure]
                            imap.copy(message_id, imap_options[:move_on_failure])
                            imap.store(message_id, "+FLAGS", [:Deleted])
                          end
                        end
                      end
                      imap.expunge
                    end
                    private
                    def logger
-                     RAILS_DEFAULT_LOGGER
+                     ::Rails.logger
                    end
                  end
                end
              end

lib/redmine/pop3.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'net/pop'
              module Redmine
                module POP3
                  class << self
                    def check(pop_options={}, options={})
                      host = pop_options[:host] || '127.0.0.1'
                      port = pop_options[:port] || '110'
                      apop = (pop_options[:apop].to_s == '1')
                      delete_unprocessed = (pop_options[:delete_unprocessed].to_s == '1')
                      pop = Net::POP3.APOP(apop).new(host,port)
                      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?
                          logger.debug "No email to process" if logger && logger.debug?
                        else
                          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-I[dD]: (.*)/ ? $1 : '').strip
                            if MailHandler.receive(message, options)
                              msg.delete
                              logger.debug "--> Message #{message_id} processed and deleted from the server" if logger && logger.debug?
                            else
                              if delete_unprocessed
                                msg.delete
                                logger.debug "--> Message #{message_id} NOT processed and deleted from the server" if logger && logger.debug?
                              else
                                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
+                     ::Rails.logger
                    end
                  end
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages