log4r 1.0.6 → 1.1.0

data/src/log4r/CVS/Entries

@@ -0,0 +1,14 @@
+/base.rb/1.1.1.1/Fri Mar 19 03:31:06 2004//
+/config.rb/1.1.1.1/Fri Mar 19 03:31:06 2004//
+/configurator.rb/1.1.1.1/Fri Mar 19 03:31:06 2004//
+/logevent.rb/1.1.1.1/Fri Mar 19 03:31:06 2004//
+/logger.rb/1.1.1.1/Fri Mar 19 03:31:07 2004//
+/loggerfactory.rb/1.1.1.1/Fri Mar 19 03:31:07 2004//
+/logserver.rb/1.1.1.1/Fri Mar 19 03:31:07 2004//
+/repository.rb/1.1.1.1/Fri Mar 19 03:31:07 2004//
+/staticlogger.rb/1.1.1.1/Fri Mar 19 03:31:07 2004//
+/yamlconfigurator.rb/1.1.1.1/Fri Mar 19 03:31:08 2004//
+D/formatter////
+D/lib////
+D/outputter////
+D/rdoc////

data/src/log4r/CVS/Repository

@@ -0,0 +1 @@
+log4r/src/log4r

data/src/log4r/CVS/Root

@@ -0,0 +1 @@
+:ext:colbygk@rubyforge.org:/var/cvs/log4r

data/src/log4r/formatter/CVS/Entries

@@ -0,0 +1,3 @@
+/formatter.rb/1.2/Sat Sep 19 05:16:43 2009//
+/patternformatter.rb/1.3/Wed Sep 23 03:49:51 2009//
+D

data/src/log4r/formatter/CVS/Repository

@@ -0,0 +1 @@
+log4r/src/log4r/formatter

data/src/log4r/formatter/CVS/Root

@@ -0,0 +1 @@
+:ext:colbygk@rubyforge.org:/var/cvs/log4r

data/src/log4r/lib/CVS/Entries

@@ -0,0 +1,3 @@
+/drbloader.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/xmlloader.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+D

data/src/log4r/lib/CVS/Repository

@@ -0,0 +1 @@
+log4r/src/log4r/lib

data/src/log4r/lib/CVS/Root

@@ -0,0 +1 @@
+:ext:colbygk@rubyforge.org:/var/cvs/log4r

data/src/log4r/outputter/CVS/Entries

@@ -0,0 +1,12 @@
+/consoleoutputters.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/datefileoutputter.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/emailoutputter.rb/1.2/Sat Sep 19 05:08:44 2009//
+/fileoutputter.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/iooutputter.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/outputterfactory.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/remoteoutputter.rb/1.1.1.1/Fri Mar 19 03:31:09 2004//
+/rollingfileoutputter.rb/1.1.1.1/Fri Mar 19 03:31:10 2004//
+/staticoutputter.rb/1.1.1.1/Fri Mar 19 03:31:10 2004//
+/outputter.rb/1.1.1.1/Wed Sep 23 03:37:53 2009//
+/syslogoutputter.rb/1.3/Wed Sep 23 06:20:19 2009//
+D

data/src/log4r/outputter/CVS/Repository

@@ -0,0 +1 @@
+log4r/src/log4r/outputter

data/src/log4r/outputter/CVS/Root

@@ -0,0 +1 @@
+:ext:colbygk@rubyforge.org:/var/cvs/log4r

data/src/log4r/outputter/syslogoutputter.rb

@@ -1,6 +1,6 @@
 # :include: ../rdoc/syslogoutputter
 #
-# Version:: $Id: syslogoutputter.rb,v 1.1.1.1 2004/03/19 03:31:10 fando Exp $
+# Version:: $Id: syslogoutputter.rb,v 1.3 2009/09/23 06:20:19 colbygk Exp $
 # Author:: Steve Lumos
 # Author:: Leon Torres
 
@@ -12,25 +12,41 @@ require 'syslog'
 module Log4r
 
   # syslog needs to set the custom levels
-  if LNAMES.size > 1
-    raise LoadError, "Must let syslogger.rb define custom levels"
-  end
+  #if LNAMES.size > 1
+  #  raise LoadError, "Must let syslogger.rb define custom levels"
+  #end
   # tune log4r to syslog priorities
-  Configurator.custom_levels("DEBUG", "INFO", "NOTICE", "WARNING", "ERR", "CRIT", "ALERT", "EMERG")
+  #Configurator.custom_levels("DEBUG", "INFO", "NOTICE", "WARNING", "ERR", "CRIT", "ALERT", "EMERG")
+
+  SYSLOGNAMES = Hash.new
 
   class SyslogOutputter < Outputter
     include Syslog::Constants
 
-    # maps log4r levels to syslog priorities (logevents never see ALL and OFF)
-    SYSLOG_LEVELS = [
-        nil, 
-        LOG_DEBUG, 
-        LOG_INFO, 
-        LOG_WARNING, 
-        LOG_ERR, 
-        LOG_CRIT, 
-        nil
-    ]
+    # maps default log4r levels to syslog priorities (logevents never see ALL and OFF)
+    SYSLOG_LEVELS_MAP = {
+      "DEBUG"  => LOG_DEBUG, 
+      "INFO"   => LOG_INFO, 
+      "NOTICE" => LOG_NOTICE,  # by default NOTICE is not in log4r
+      "WARN"   => LOG_WARNING, 
+      "ERROR"  => LOG_ERR, 
+      "FATAL"  => LOG_CRIT,
+      "ALERT"  => LOG_ALERT,   # by default ALERT is not in log4r
+      "EMERG"  => LOG_EMERG,   # by default EMERG is not in log4r
+    }
+
+    SYSLOG_LOG4R_MAP = {
+      "DEBUG"  => "DEBUG", 
+      "INFO"   => "INFO", 
+      "WARN"   => "WARN", 
+      "ERROR"  => "ERROR", 
+      "FATAL"  => "FATAL"
+      # "NOTICE" => "INFO",      # by default NOTICE is not in log4r
+      # "ALERT"  => "FATAL",     # by default ALERT is not in log4r
+      # "EMERG"  => "FATAL"      # by default EMERG is not in log4r
+    }
+
+    @levels_map = SYSLOG_LOG4R_MAP
 
     # There are 3 hash arguments
     #
@@ -42,13 +58,14 @@ module Log4r
       ident = (hash[:ident] or hash['ident'] 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_syslog()
       @syslog = Syslog.open(ident, logopt, facility)
     end
 
     def closed?
       return !@syslog.opened?
     end
-    
+
     def close
       @syslog.close unless @syslog.nil?
       @level = OFF
@@ -56,19 +73,37 @@ module Log4r
       Logger.log_internal {"Outputter '#{@name}' closed Syslog and set to OFF"}
     end
 
+    # A single hash argument that maps custom names to syslog names
+    # 
+    # [<tt>levels_map</tt>]	A map that will create a linkage between levels
+    # 				in a hash and underlying syslog 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 syslog
+    # 				level of INFO by default.
+    def map_levels_by_name_to_syslog( lmap = SYSLOG_LOG4R_MAP )
+      @levels_map = lmap
+    end
+
+    def get_levels_map()
+      return @levels_map
+    end
+
     private
 
     def canonical_log(logevent)
-      pri = SYSLOG_LEVELS[logevent.level]
-      o = logevent.data
+      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}"
+	msg = "#{o.class} at (#{o.backtrace[0]}): #{o.message}"
       elsif o.respond_to? :to_str then
-        msg = o.to_str
+	msg = o.to_str
       else
-        msg = o.inspect
+	msg = o.inspect
       end
-      
+
       @syslog.log(pri, '%s', msg)
     end
   end

data/src/log4r/rdoc/CVS/Entries

@@ -0,0 +1,11 @@
+/configurator/1.1.1.1/Fri Mar 19 03:31:11 2004//
+/emailoutputter/1.1.1.1/Fri Mar 19 03:31:11 2004//
+/formatter/1.1.1.1/Fri Mar 19 03:31:11 2004//
+/log4r/1.1.1.1/Fri Mar 19 03:31:11 2004//
+/logger/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/logserver/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/outputter/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/patternformatter/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/syslogoutputter/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/yamlconfigurator/1.1.1.1/Fri Mar 19 03:31:12 2004//
+D

data/src/log4r/rdoc/CVS/Repository

@@ -0,0 +1 @@
+log4r/src/log4r/rdoc

data/src/log4r/rdoc/CVS/Root

@@ -0,0 +1 @@
+:ext:colbygk@rubyforge.org:/var/cvs/log4r

data/src/tst.rb

@@ -0,0 +1,21 @@
+require 'log4r'
+require 'log4r/configurator'
+require 'log4r/formatter/patternformatter'
+require 'log4r/outputter/syslogoutputter'
+require 'syslog'
+include Log4r
+include Syslog::Constants
+#lgr=Log4r::Logger.new( 'ObsLog' )
+##slgr=Log4r::SyslogOutputter.new( 'obscntlsh', { :logopt => LOG_CONS | LOG_PID | LOG_PERROR, :facility => LOG_LOCAL7 } )
+#slgr=Outputter.stdout
+#lgr.add(slgr)
+#slgr.formatter=PatternFormatter.new( :pattern => 'ATA: {%d} {%l} {%C} {%m}', :date_method => 'usec' )
+#lgr.info "test"
+
+
+lgr2=Log4r::Logger.new( 'ObsLog' )
+pfmt=PatternFormatter.new( :pattern => 'ATA: {%d} {%l} {%C} {%m}', :date_method => 'usec' )
+slgr2=Log4r::SyslogOutputter.new( 'obscntlsh', { :logopt => LOG_CONS | LOG_PID | LOG_PERROR, :facility => LOG_LOCAL7, :formatter => pfmt } )
+lgr2.add(slgr2)
+lgr2.info "test"
+

data/tests/CVS/Entries

@@ -0,0 +1,11 @@
+/README/1.1.1.1/Fri Mar 19 03:31:13 2004//
+/testall.rb/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/testbase.rb/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/testconf.xml/1.1.1.1/Fri Mar 19 03:31:13 2004//
+/testcustom.rb/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/testformatter.rb/1.1.1.1/Fri Mar 19 03:31:12 2004//
+/testlogger.rb/1.1.1.1/Fri Mar 19 03:31:13 2004//
+/testoutputter.rb/1.1.1.1/Fri Mar 19 03:31:13 2004//
+/testpatternformatter.rb/1.1.1.1/Fri Mar 19 03:31:13 2004//
+/testxmlconf.rb/1.1.1.1/Fri Mar 19 03:31:13 2004//
+D

data/tests/CVS/Repository

@@ -0,0 +1 @@
+log4r/tests

data/tests/CVS/Root

@@ -0,0 +1 @@
+:ext:colbygk@rubyforge.org:/var/cvs/log4r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: log4r
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill
@@ -9,51 +9,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Log4r is a comprehensive and flexible logging library written in Ruby for use in Ruby programs. It features a hierarchical logging system of any number of levels, custom level names, logger inheritance, multiple output destinations per log event, execution tracing, custom formatting, thread saftey, XML and YAML configuration, and more.  The design pattern for this project follows that of the Apache Log4j project.
-email: colby(at)astro.berkeley.edu
+description: "See also: http://logging.apache.org/log4j"
+email: colby@astro.berkeley.edu
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
 files: 
-- doc/content/contact.html
-- doc/content/contribute.html
-- doc/content/index.html
-- doc/content/license.html
-- doc/content/manual.html
-- doc/dev/checklist
-- doc/dev/README.developers
-- doc/dev/things-to-do
-- doc/images/log4r-logo.png
-- doc/images/logo2.png
-- doc/log4r.css
-- doc/templates/main.html
-- examples/customlevels.rb
-- examples/fileroll.rb
-- examples/log4r_yaml.yaml
-- examples/logclient.rb
-- examples/logserver.rb
-- examples/moderate.xml
-- examples/moderateconfig.rb
-- examples/myformatter.rb
-- examples/outofthebox.rb
-- examples/README
-- examples/rrconfig.xml
-- examples/rrsetup.rb
-- examples/simpleconfig.rb
-- examples/xmlconfig.rb
-- examples/yaml.rb
+- LICENSE
+- LICENSE.LGPLv3
+- README
+- INSTALL
+- Rakefile
+- TODO
+- src/CVS/Entries
+- src/CVS/Repository
+- src/CVS/Root
 - src/log4r/base.rb
 - src/log4r/config.rb
 - src/log4r/configurator.rb
+- src/log4r/CVS/Entries
+- src/log4r/CVS/Repository
+- src/log4r/CVS/Root
+- src/log4r/formatter/CVS/Entries
+- src/log4r/formatter/CVS/Repository
+- src/log4r/formatter/CVS/Root
 - src/log4r/formatter/formatter.rb
 - src/log4r/formatter/patternformatter.rb
+- src/log4r/lib/CVS/Entries
+- src/log4r/lib/CVS/Repository
+- src/log4r/lib/CVS/Root
 - src/log4r/lib/drbloader.rb
 - src/log4r/lib/xmlloader.rb
 - src/log4r/logevent.rb
@@ -61,6 +54,9 @@ files:
 - src/log4r/loggerfactory.rb
 - src/log4r/logserver.rb
 - src/log4r/outputter/consoleoutputters.rb
+- src/log4r/outputter/CVS/Entries
+- src/log4r/outputter/CVS/Repository
+- src/log4r/outputter/CVS/Root
 - src/log4r/outputter/datefileoutputter.rb
 - src/log4r/outputter/emailoutputter.rb
 - src/log4r/outputter/fileoutputter.rb
@@ -72,6 +68,9 @@ files:
 - src/log4r/outputter/staticoutputter.rb
 - src/log4r/outputter/syslogoutputter.rb
 - src/log4r/rdoc/configurator
+- src/log4r/rdoc/CVS/Entries
+- src/log4r/rdoc/CVS/Repository
+- src/log4r/rdoc/CVS/Root
 - src/log4r/rdoc/emailoutputter
 - src/log4r/rdoc/formatter
 - src/log4r/rdoc/log4r
@@ -85,6 +84,29 @@ files:
 - src/log4r/staticlogger.rb
 - src/log4r/yamlconfigurator.rb
 - src/log4r.rb
+- src/tst.rb
+- examples/customlevels.rb
+- examples/CVS/Entries
+- examples/CVS/Repository
+- examples/CVS/Root
+- examples/fileroll.rb
+- examples/log4r_yaml.yaml
+- examples/logclient.rb
+- examples/logserver.rb
+- examples/moderate.xml
+- examples/moderateconfig.rb
+- examples/myformatter.rb
+- examples/outofthebox.rb
+- examples/README
+- examples/rrconfig.xml
+- examples/rrsetup.rb
+- examples/simpleconfig.rb
+- examples/syslogcustom.rb
+- examples/xmlconfig.rb
+- examples/yaml.rb
+- tests/CVS/Entries
+- tests/CVS/Repository
+- tests/CVS/Root
 - tests/README
 - tests/testall.rb
 - tests/testbase.rb
@@ -95,8 +117,44 @@ files:
 - tests/testoutputter.rb
 - tests/testpatternformatter.rb
 - tests/testxmlconf.rb
+- doc/content/contact.html
+- doc/content/contribute.html
+- doc/content/CVS/Entries
+- doc/content/CVS/Repository
+- doc/content/CVS/Root
+- doc/content/index.html
+- doc/content/license.html
+- doc/content/manual.html
+- doc/CVS/Entries
+- doc/CVS/Repository
+- doc/CVS/Root
+- doc/dev/checklist
+- doc/dev/CVS/Entries
+- doc/dev/CVS/Repository
+- doc/dev/CVS/Root
+- doc/dev/README.developers
+- doc/dev/things-to-do
+- doc/images/CVS/Entries
+- doc/images/CVS/Repository
+- doc/images/CVS/Root
+- doc/images/log4r-logo.png
+- doc/images/logo2.png
+- doc/log4r.css
+- doc/templates/CVS/Entries
+- doc/templates/CVS/Repository
+- doc/templates/CVS/Root
+- doc/templates/main.html
+- bin/CVS/Entries
+- bin/CVS/Repository
+- bin/CVS/Root
+- bin/devconfig.rb
+- bin/makedist.rb
+- bin/makehtml.rb
+- bin/makerdoc.rb
+- bin/prune.rb
+- bin/README
 has_rdoc: true
-homepage: http://rubyforge.org/projects/log4r
+homepage: http://log4r.rubyforge.org
 licenses: []
 
 post_install_message: 
@@ -122,6 +180,6 @@ rubyforge_project: log4r
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Log4r is a comprehensive and flexible logging library for Ruby.  Following the design pattern of Log4j
+summary: Log4r, logging framework for ruby
 test_files: []