syslog-logger 1.6.5 → 1.6.6

data/README.rdoc

@@ -4,24 +4,24 @@ http://github.com/ngmoco/sysloglogger
 
 == DESCRIPTION:
 
-SyslogLogger is a Logger replacement that logs to syslog. It is almost drop-in
-with a few caveats. You can add SyslogLogger to your Rails production
+Logger::Syslog is a Logger replacement that logs to syslog. It is almost drop-in
+with a few caveats. You can add Logger::Syslog to your Rails production
 environment to aggregate logs between multiple machines.
 
-NOTE! You can only set the SyslogLogger program name and facility when you initialize
-SyslogLogger for the first time. This is a limitation of the way SyslogLogger
+NOTE! You can only set the Logger::Syslog program name and facility when you initialize
+Logger::Syslog for the first time. This is a limitation of the way Logger::Syslog
 uses syslog (and in some ways, a limitation of the way syslog(3) works).
-Attempts to change SyslogLogger's program name or facility after the first initialization
+Attempts to change Logger::Syslog's program name or facility after the first initialization
 will be ignored.
 
-This particular SyslogLogger improves the original by correctly mapping Rails log severities to
+This particular Logger::Syslog improves the original by correctly mapping Rails log severities to
 the Syslog counterparts.  It also adds the ability to select a syslog facility other than "user."
 
 == SYNOPSIS:
 
 === config/environment.rb
 
-  config.gem 'syslog_logger'
+  config.gem 'syslog-logger'
 
 === Gemfile
 
@@ -31,13 +31,12 @@ the Syslog counterparts.  It also adds the ability to select a syslog facility o
 
 (Only this environment, since you probably only want to enable it for Production, and not Test or Development.)
 
-  require 'syslog_logger'
-  RAILS_DEFAULT_LOGGER = SyslogLogger.new 
+  RAILS_DEFAULT_LOGGER = Logger::Syslog.new 
 
-By default, SyslogLogger uses the program name 'rails' and the facility 'user', but this can be
-changed via the arguments to SyslogLogger.new:
+By default, Logger::Syslog uses the program name 'rails' and the facility 'user', but this can be
+changed via the arguments to Logger::Syslog.new:
 
-  RAILS_DEFAULT_LOGGER = SyslogLogger.new('mygreatapp', Syslog::LOG_LOCAL7)
+  RAILS_DEFAULT_LOGGER = Logger::Syslog.new('mygreatapp', Syslog::LOG_LOCAL7)
   
 === BSD syslog setup
 

data/lib/syslog_logger_env_formatting.rb

@@ -11,7 +11,7 @@
 # logger.error {"Something is messed up!"}
 #     #=> [development] [ERROR: 2008-01-25 14:16:12.12345] [123] [ClassName] Something is messed up!
 
-class SyslogLogger
+class Logger::Syslog
 
     # short names for "DEBUG", "INFO", ...
     # must be ordered to correspond to severity constants defined in 
@@ -21,18 +21,13 @@ class SyslogLogger
 
     @@log_level_names = %w( DEBUG INFO WARN ERROR FATAL UNKNOWN )
     LOG_NAME_FIELD_WIDTH = 7
-    
+  
     def add_with_formatting(severity, message = nil, progname = nil, &block)
       severity ||= Logger::UNKNOWN
-      message = "[#{RAILS_ENV}] [#{@@log_level_names[severity].ljust(LOG_NAME_FIELD_WIDTH)}: #{time.strftime("%Y-%m-%d %H:%M:%S")}.#{time.usec.to_s.rjust(6, '0')}] #{message}"
+      message = "[#{RAILS_ENV}] [#{@@log_level_names[severity].ljust(LOG_NAME_FIELD_WIDTH)}: #{time.strftime("%Y-%m-%d %H:%M:%S")}.#{time.usec.to_s.rjust(6, '0')}] #{message || block.call}"
 
-      if(block)
-        add_without_formatting(severity, message, progname,
-          &Proc.new{g_log_formatter(severity, nil, user, &block)})
-      else
-        add_without_formatting(severity, message, progname)
-      end
+      add_without_formatting(severity, message, progname)
     end
     alias_method_chain :add, :formatting
-    
-end
+  
+end

data/test/test_syslog_logger.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'tempfile'
-require 'syslog_logger'
+require 'syslog-logger'
 
 module MockSyslog; end
 
@@ -8,7 +8,7 @@ class << MockSyslog
 
   @line = nil
 
-  SyslogLogger::LOGGER_MAP.values.uniq.each do |level|
+  Logger::Syslog::LOGGER_MAP.values.uniq.each do |level|
     eval <<-EOM
       def #{level}(message)
         @line = "#{level.to_s.upcase} - \#{message}"
@@ -29,7 +29,7 @@ class << MockSyslog
 
 end
 
-SyslogLogger.const_set :SYSLOG, MockSyslog
+Logger::Syslog.const_set :SYSLOG, MockSyslog
 
 class TestLogger < Test::Unit::TestCase
 
@@ -457,7 +457,7 @@ class TestSyslogLogger < TestLogger
 
   def setup
     super
-    @logger = SyslogLogger.new
+    @logger = Logger::Syslog.new
   end
 
   class Log
@@ -466,7 +466,7 @@ class TestSyslogLogger < TestLogger
       @line = line
       return unless /\A(\w+) - (.*)\Z/ =~ @line
       severity, @msg = $1, $2
-      severity = SyslogLogger::LOGGER_MAP.invert[severity.downcase.intern]
+      severity = Logger::Syslog::LOGGER_MAP.invert[severity.downcase.intern]
       @severity = severity.to_s.upcase
       @severity = 'ANY' if @severity == 'UNKNOWN'
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 6
+  version: 1.6.6
 platform: ruby
 authors: 
 - Eric Hodel; Chris Powell; Matthew Boeh; Ian Lesperance; Dana Danger; Brian Smith; Ashley Martens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 -08:00
+date: 2012-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - README.rdoc
-- lib/syslog_logger.rb
 - lib/syslog_logger_env_formatting.rb
 has_rdoc: true
 homepage: http://github.com/ngmoco/syslog_logger

data/lib/syslog_logger.rb

@@ -1,116 +0,0 @@
-require 'syslog'
-require 'logger'
-
-class SyslogLogger
-  include Logger::Severity
-
-  # The version of SyslogLogger you are using.
-  VERSION = '1.6.1'
-
-  # From 'man syslog.h':
-  # LOG_EMERG   A panic condition was reported to all processes.
-  # LOG_ALERT   A condition that should be corrected immediately.
-  # LOG_CRIT    A critical condition.
-  # LOG_ERR     An error message.
-  # LOG_WARNING A warning message.
-  # LOG_NOTICE  A condition requiring special handling.
-  # LOG_INFO    A general information message.
-  # LOG_DEBUG   A message useful for debugging programs.
-
-  # From logger rdoc:
-  # FATAL:  an unhandleable error that results in a program crash
-  # ERROR:  a handleable error condition
-  # WARN:   a warning
-  # INFO:   generic (useful) information about system operation
-  # DEBUG:  low-level information for developers
-
-  # Maps Logger warning types to syslog(3) warning types.
-  LOGGER_MAP = {
-    :unknown => :alert,
-    :fatal   => :crit,
-    :error   => :err,
-    :warn    => :warning,
-    :info    => :info,
-    :debug   => :debug
-  }
-
-  # Maps Logger log levels to their values so we can silence.
-  LOGGER_LEVEL_MAP = {}
-
-  LOGGER_MAP.each_key do |key|
-    LOGGER_LEVEL_MAP[key] = Logger.const_get key.to_s.upcase
-  end
-
-  # Maps Logger log level values to syslog log levels.
-  LEVEL_LOGGER_MAP = {}
-
-  LOGGER_LEVEL_MAP.invert.each do |level, severity|
-    LEVEL_LOGGER_MAP[level] = LOGGER_MAP[severity]
-  end
-
-  # Builds a methods for level +meth+.
-  for severity in Logger::Severity.constants
-    class_eval <<-EOT, __FILE__, __LINE__
-      def #{severity.downcase}(message = nil, progname = nil, &block)  # def debug(message = nil, progname = nil, &block)
-        add(#{severity}, message, progname, &block)                    #   add(DEBUG, message, progname, &block)
-      end                                                              # end
-                                                                       #
-      def #{severity.downcase}?                                        # def debug?
-        #{severity} >= @level                                          #   DEBUG >= @level
-      end                                                              # end
-    EOT
-  end
-
-  # Log level for Logger compatibility.
-  attr_accessor :level
-
-  # Fills in variables for Logger compatibility.  If this is the first
-  # instance of SyslogLogger, +program_name+ may be set to change the logged
-  # program name and +facility+ may be set to specify a custom facility
-  # with your syslog daemon.
-  #
-  # Due to the way syslog works, only one program name may be chosen.
-  def initialize(program_name = 'rails', facility = Syslog::LOG_USER, logopts=nil)
-    @level = Logger::DEBUG
-
-    return if defined? SYSLOG
-    self.class.const_set :SYSLOG, Syslog.open(program_name, logopts, facility)
-  end
-
-  # Almost duplicates Logger#add.  +progname+ is ignored.
-  def add(severity, message = nil, progname = nil, &block)
-    severity ||= Logger::UNKNOWN
-    if severity >= @level
-      message = clean(message || block.call)
-      SYSLOG.send LEVEL_LOGGER_MAP[severity], clean(message)
-    end
-    true
-  end
-
-  # Allows messages of a particular log level to be ignored temporarily.
-  def silence(temporary_level = Logger::ERROR)
-    old_logger_level = @level
-    @level = temporary_level
-    yield
-  ensure
-    @level = old_logger_level
-  end
-
-  # In Logger, this dumps the raw message; the closest equivalent
-  # would be Logger::UNKNOWN
-  def <<(message)
-    add(Logger::UNKNOWN, message)
-  end
-
-private
-
-  # Clean up messages so they're nice and pretty.
-  def clean(message)
-    message = message.to_s.dup
-    message.strip!
-    message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
-    message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
-    return message
-  end
-
-end