log4r 1.1.4 → 1.1.5

data/src/log4r/outputter/emailoutputter.rb.orig

@@ -1,118 +0,0 @@
-# :include: ../rdoc/emailoutputter
-
-require 'log4r/outputter/outputter'
-require 'log4r/staticlogger'
-require 'net/smtp'
-
-module Log4r
-
-  class EmailOutputter < Outputter
-    attr_reader :server, :port, :domain, :acct, :authtype, :subject
-
-    def initialize(_name, hash={})
-      super(_name, hash)
-      validate(hash)
-      @buff = []
-      begin 
-        Logger.log_internal {
-          "EmailOutputter '#{@name}' running SMTP client on #{@server}:#{@port}"
-        }
-      rescue Exception => e
-        Logger.log_internal(-2) {
-          "EmailOutputter '#{@name}' failed to start SMTP client!"
-        }
-        Logger.log_internal {e}
-        self.level = OFF
-	raise e
-      end
-    end
-
-    # send out an email with the current buffer
-    def flush
-      synch { send_mail }
-      Logger.log_internal {"Flushed EmailOutputter '#{@name}'"}
-    end
-
-    private
-
-    def validate(hash)
-      @buffsize = (hash[:buffsize] or hash['buffsize'] or 100).to_i
-      @formatfirst = Log4rTools.decode_bool(hash, :formatfirst, false)
-      decode_immediate_at(hash)
-      validate_smtp_params(hash)
-    end
-
-    def decode_immediate_at(hash)
-      @immediate = Hash.new
-      _at = (hash[:immediate_at] or hash['immediate_at'])
-      return if _at.nil?
-      Log4rTools.comma_split(_at).each {|lname|
-        level = LNAMES.index(lname)
-        if level.nil?
-          Logger.log_internal(-2) do
-            "EmailOutputter: skipping bad immediate_at level name '#{lname}'"
-          end
-          next
-        end
-        @immediate[level] = true
-      }
-    end
-
-    def validate_smtp_params(hash)
-      @from = (hash[:from] or hash['from'])
-      raise ArgumentError, "Must specify from address" if @from.nil?
-      _to = (hash[:to] or hash['to'] or "")
-      @to = Log4rTools.comma_split(_to) 
-      raise ArgumentError, "Must specify recepients" if @to.empty?
-      @server = (hash[:server] or hash['server'] or 'localhost')
-      @port = (hash[:port] or hash['port'] or 25).to_i
-      @domain = (hash[:domain] or hash['domain'] or ENV['HOSTNAME'])
-      @acct = (hash[:acct] or hash['acct'])
-      @passwd = (hash[:passwd] or hash['passwd'])
-      @authtype = (hash[:authtype] or hash['authtype'] or :cram_md5).to_s.intern
-      @subject = (hash[:subject] or hash['subject'] or "Message of #{$0}")
-      @params = [@server, @port, @domain, @acct, @passwd, @authtype]
-    end
-
-    def canonical_log(event)
-      synch {
-        @buff.push case @formatfirst
-          when true then @formatter.format event
-          else event 
-          end
-        send_mail if @buff.size >= @buffsize or @immediate[event.level]
-      }
-    end
-
-    def send_mail
-      msg = 
-        case @formatfirst
-        when true then @buff.join 
-        else @buff.collect{|e| @formatter.format e}.join 
-        end
-
-      ### build a mail header for RFC 822
-      rfc822msg =
-        "From: #{@from}\n" +
-        "To: #{@to}\n" +
-        "Subject: #{@subject}\n" +
-        "Date: #{Time.now.strftime( "%a, %d %b %Y %H:%M:%S %z %Z")}\n" +
-        "Message-Id: <#{"%.8f" % Time.now.to_f}@#{@domain}>\n\n" +
-        "#{msg}"
-
-      ### send email
-      begin Net::SMTP.start(*@params) do |smtp|
-        smtp.sendmail(rfc822msg, @from, @to)
-      end
-      rescue Exception => e
-        Logger.log_internal(-2) {
-          "EmailOutputter '#{@name}' couldn't send email!"
-        }
-        Logger.log_internal {e}
-        self.level = OFF
-	raise e
-      ensure @buff.clear
-      end
-    end
-  end
-end

data/src/log4r/outputter/emailoutputter.rb.rej

@@ -1,46 +0,0 @@
-***************
-*** 100,114 ****
-         "Message-Id: <#{"%.8f" % Time.now.to_f}@#{@domain}>\n\n" +
-  	"#{msg}"
-  
--       ### send email
--       begin @smtp.sendmail(rfc822msg, @from, @to)
--       rescue Exception => e
--         Logger.log_internal(-2) {
--           "EmailOutputter '#{@name}' couldn't send email!"
--         }
--         Logger.log_internal {e}
--         self.level = OFF
--       ensure @buff.clear
-        end
-      end
-    end
---- 100,127 ----
-         "Message-Id: <#{"%.8f" % Time.now.to_f}@#{@domain}>\n\n" +
-  	"#{msg}"
-  
-+       begin
-+         3.times do
-+           begin
-+             ### send email
-+             @smtp.sendmail(rfc822msg, @from, @to)
-+             break
-+           rescue Net::SMTPServerBusy => e
-+             Logger.log_internal(-2) {
-+               "Try to restart EmailOutputter '#{@name}'! (#{e.message})"
-+             }
-+             @smtp = Net::SMTP.start(*@params)
-+           rescue Exception => e
-+             Logger.log_internal(-2) {
-+               "EmailOutputter '#{@name}' couldn't send email! (#{e.message})"
-+               break
-+             }
-+             Logger.log_internal {e}
-+             self.level = OFF
-+           end
-+         end
-+       ensure
-+         @buff.clear
-        end
-      end
-    end

data/src/log4r/outputter/win32eventoutputter.rb

@@ -1,136 +0,0 @@
-# :include: ../rdoc/win32eventoutputter
-#
-# Version:: $Id: syslogoutputter.rb,v 1.5 2009/09/25 20:33:33 colbygk Exp $
-# Author:: Colby Gutierrez-Kraybill
-# 
-# NOTE: THIS IS A DEVELOPMENT VERSION AND IS NOT READY FOR USE
-# INFACT, IT MAY NEVER BE READY FOR USE, AS TRYING TO INTERACT
-# WITH THE WIN32 EVENTLOG API REQUIRES USER INTERVENTION TO LOOKUP
-# event_id AND category CODES THAT THIS LIBRARY CANNOT KNOW A PRIORI
-#
-# I have added this to the cvs tree to keep as a work in flight
-# It is presently UNUSABLE
-#
-
-require 'log4r/formatter/formatter'
-require 'log4r/outputter/outputter'
-require 'log4r/configurator'
-require 'win32/eventlog'
-
-module Log4r
-  include Win32
-
-  class Win32EventLogOutputter < Outputter
-
-    # maps default log4r levels to win32 event priorities
-    # (logevents never see ALL and OFF)
-    # WIN32EVENTLOG Levels are:
-    #  "SUCCESS"       => EVENTLOG_SUCCESS
-    #  "AUDIT_SUCCESS" => AUDIT_SUCCESS 
-    #  "INFO"          => EVENTLOG_INFO 
-    #  "WARN"          => EVENTLOG_WARN 
-    #  "ERROR"         => EVENTLOG_ERROR
-    #  "AUDIT_FAILURE" => AUDIT_FAILURE 
-    WIN32EVENTLOG_LEVELS_MAP = {
-      "SUCCESS"       => EVENTLOG_SUCCESS, 
-      "AUDIT_SUCCESS" => AUDIT_SUCCESS, 
-      "INFO"          => EVENTLOG_INFO, 
-      "WARN"          => EVENTLOG_WARN, 
-      "ERROR"         => EVENTLOG_ERROR, 
-      "AUDIT_FAILURE" => AUDIT_FAILURE 
-    }
-
-    # mapping from Log4r default levels to win32 eventlog, by string name
-    #  "DEBUG"  => "INFO"   # by default DEBUG is not in win32 eventlog
-    #  "INFO"   => "INFO" 
-    #  "WARN"   => "WARN"
-    #  "ERROR"  => "ERROR" 
-    #  "FATAL"  => "ERROR"  # by default FATAL is not in win32 eventlog
-    #  "SUCCESS" => "SUCCESS"  # by default SUCCESS is not in log4r
-    #  "AUDIT_SUCCESS"  => "AUDIT_SUCCESS"  # by default AUDIT_SUCCESS is not in log4r
-    #  "AUDIT_FAILURE"  => "AUDIT_FAILURE"   # by default AUDIT_FATAL is not in log4r
-    WIN32EVENTLOG_LOG4R_MAP = {
-      "DEBUG"  => "INFO",
-      "INFO"   => "INFO", 
-      "WARN"   => "WARN",
-      "ERROR"  => "ERROR", 
-      "FATAL"  => "ERROR",
-      "SUCCESS" => "SUCCESS",
-      "AUDIT_SUCCESS"  => "AUDIT_SUCCESS",
-      "AUDIT_FAILURE"  => "AUDIT_FAILURE"
-    }
-
-    @levels_map = WIN32EVENTLOG_LOG4R_MAP
-
-    # There are 3 hash arguments
-    #
-    # [<tt>:registry_source</tt>]   eventlog registry source, defaults to "Application"
-    # [<tt>:source</tt>]    eventlog source, defaults to _name
-    def initialize(_name, hash={})
-      super(_name, hash)
-      registry_source = (hash[:registry_source] or hash['registry_source'] or "Application")
-      @source = (hash[:source] or hash['source'] or _name)
-      logopt = (hash[:logopt] or hash['logopt'] or LOG_PID | LOG_CONS).to_i
-      facility = (hash[:facility] or hash['facility'] or LOG_USER).to_i
-      map_levels_by_name_to_eventlog()
-      if ( Syslog.opened? ) then
-	Logger.log_internal { "Syslog already initialized, to alter, " +
-	  "you must close first"}
-      end
-      # @syslog = ( Syslog.opened? ) ? Syslog : Syslog.open(ident, logopt, facility)
-    end
-
-    def closed?
-      return true # !@syslog.opened?
-    end
-
-    def close
-      #@syslog.close unless @syslog.nil?
-      #@level = OFF
-      OutputterFactory.create_methods(self)
-      Logger.log_internal {"Outputter '#{@name}' closed Syslog and set to OFF"}
-    end
-
-    # A single hash argument that maps custom names to eventlog names
-    # 
-    # [<tt>levels_map</tt>]	A map that will create a linkage between levels
-    # 				in a hash and underlying eventlog levels.
-    # 				By default, these are direct mapping of the log4r
-    # 				levels (e.g. "DEBUG" => "DEBUG")
-    # 				If you have defined your own custom levels, you
-    # 				should provide this underlying mapping, otherwise
-    # 				all messages will be mapped to the underlying eventlog
-    # 				level of INFO by default.
-    # 				e.g.
-    # 				You have created custom levels called:
-    # 				<tt>Configurator.custom_levels "HIGH", "MEDIUM", "LOW"</tt>
-    # 				To map these to 'equivilent' eventlog levels, after instantiatin
-    # 				a eventlogoutputter:
-    # 				<tt>EventLogOutputter.map_levels_by_name_to_eventlog(
-    # 				{ "HIGH" => "ALERT", "MEDIUM" => "WARN", "LOW" => "INFO" }
-    # 				)</tt>
-    def map_levels_by_name_to_eventlog( lmap = WIN32EVENTLOG_LOG4R_MAP )
-      @levels_map = lmap
-    end
-
-    def get_levels_map()
-      return @levels_map
-    end
-
-    private
-
-    def canonical_log(logevent)
-      pri = SYSLOG_LEVELS_MAP[@levels_map[LNAMES[logevent.level]]] rescue pri = LOG_INFO
-      o = format(logevent)
-      if o.kind_of? Exception then
-	msg = "#{o.class} at (#{o.backtrace[0]}): #{o.message}"
-      elsif o.respond_to? :to_str then
-	msg = o.to_str
-      else
-	msg = o.inspect
-      end
-
-      # @syslog.log(pri, '%s', msg)
-    end
-  end
-end