log4r 1.1.1 → 1.1.2

data/src/log4r.rb

@@ -3,7 +3,7 @@
 # == Other Info
 #
 # Author::      Leon Torres
-# Version::     $Id: log4r.rb,v 1.3 2009/09/23 21:25:18 colbygk Exp $
+# Version::     $Id: log4r.rb,v 1.4 2009/09/25 20:33:47 colbygk Exp $
 
 require "log4r/outputter/fileoutputter"
 require "log4r/outputter/consoleoutputters"
@@ -13,5 +13,5 @@ require "log4r/formatter/patternformatter"
 require "log4r/loggerfactory"
 
 module Log4r
-  Log4rVersion = [1, 1, 1].join '.'
+  Log4rVersion = [1, 1, 2].join '.'
 end

data/src/log4r/formatter/patternformatter.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 #
-# Version:: $Id: patternformatter.rb,v 1.3 2009/09/19 05:16:43 colbygk Exp $
+# Version:: $Id: patternformatter.rb,v 1.5 2009/09/25 20:33:33 colbygk Exp $
 
 require "log4r/formatter/formatter"
   
@@ -11,12 +11,24 @@ module Log4r
   class PatternFormatter < BasicFormatter
   
     # Arguments to sprintf keyed to directive letters
+    # %c - event short name
+    # %C - event fullname
+    # %d - date
+    # %t - trace
+    # %m - message
+    # %h - thread name
+    # %p - process ID aka PID
+    # %M - formatted message
+    # %l - Level in string form
+    # %% - Insert a %
     DirectiveTable = {
       "c" => 'event.name',
       "C" => 'event.fullname',
       "d" => 'format_date',
       "t" => '(event.tracer.nil? ? "no trace" : event.tracer[0])',
       "m" => 'event.data',
+      "h" => 'thread_name',
+      "p" => 'Process.pid.to_s',
       "M" => 'format_object(event.data)',
       "l" => 'LNAMES[event.level]',
       "%" => '"%"'
@@ -31,7 +43,7 @@ module Log4r
     # * $5 is the directive letter
     # * $6 is the stuff after the directive or "" if not applicable
   
-    DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdtmMl%]))?(.*)/
+    DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdtmhpMl%]))?(.*)/
   
     # default date format
     ISO8601 = "%Y-%m-%d %H:%M:%S"
@@ -62,6 +74,10 @@ module Log4r
       PatternFormatter.create_format_methods(self)
     end
 
+    def thread_name
+      Thread.current[:name] || Thread.current.to_s
+    end
+
     # PatternFormatter works by dynamically defining a <tt>format</tt> method
     # based on the supplied pattern format. This method contains a call to 
     # Kernel#sptrintf with arguments containing the data requested in

data/src/log4r/logger.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: logger.rb,v 1.1.1.1 2004/03/19 03:31:07 fando Exp $
+# Version:: $Id: logger.rb,v 1.2 2009/09/24 04:58:28 colbygk Exp $
 # Author:: Leon Torres <leon(at)ugcs.caltech.edu>
 
 require "log4r/outputter/outputter"
@@ -138,7 +138,7 @@ module Log4r
     def is_root?; false end
 
     def ==(other)
-      return true if id == other.id
+      return true if self.object_id == other.object_id
     end
   end
 

data/src/log4r/outputter/emailoutputter.rb

@@ -23,6 +23,7 @@ module Log4r
         }
         Logger.log_internal {e}
         self.level = OFF
+	raise e
       end
     end
 
@@ -109,6 +110,7 @@ module Log4r
         }
         Logger.log_internal {e}
         self.level = OFF
+	raise e
       ensure @buff.clear
       end
     end

data/src/log4r/outputter/syslogoutputter.rb

@@ -1,6 +1,6 @@
 # :include: ../rdoc/syslogoutputter
 #
-# Version:: $Id: syslogoutputter.rb,v 1.3 2009/09/23 06:20:19 colbygk Exp $
+# Version:: $Id: syslogoutputter.rb,v 1.5 2009/09/25 20:33:33 colbygk Exp $
 # Author:: Steve Lumos
 # Author:: Leon Torres
 
@@ -11,19 +11,21 @@ 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
-  # tune log4r to syslog priorities
-  #Configurator.custom_levels("DEBUG", "INFO", "NOTICE", "WARNING", "ERR", "CRIT", "ALERT", "EMERG")
-
   SYSLOGNAMES = Hash.new
 
   class SyslogOutputter < Outputter
     include Syslog::Constants
 
     # maps default log4r levels to syslog priorities (logevents never see ALL and OFF)
+    # SYSLOG Levels are:
+    #  "DEBUG"  => Syslog::LOG_DEBUG
+    #  "INFO"   => Syslog::LOG_INFO
+    #  "NOTICE" => Syslog::LOG_NOTICE
+    #  "WARN"   => Syslog::LOG_WARN
+    #  "ERROR"  => Syslog::LOG_ERROR
+    #  "FATAL"  => Syslog::LOG_FATAL
+    #  "ALERT"  => Syslog::LOG_ALERT
+    #  "EMERG"  => Syslog::LOG_EMERG
     SYSLOG_LEVELS_MAP = {
       "DEBUG"  => LOG_DEBUG, 
       "INFO"   => LOG_INFO, 
@@ -35,6 +37,12 @@ module Log4r
       "EMERG"  => LOG_EMERG,   # by default EMERG is not in log4r
     }
 
+    # mapping from Log4r default levels to syslog, by string name
+    # "DEBUG" => "DEBUG"
+    #  "INFO"   => "INFO" 
+    #  "WARN"   => "WARN"
+    #  "ERROR"  => "ERROR" 
+    #  "FATAL"  => "FATAL"
     SYSLOG_LOG4R_MAP = {
       "DEBUG"  => "DEBUG", 
       "INFO"   => "INFO", 
@@ -59,7 +67,11 @@ module Log4r
       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)
+      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?
@@ -83,6 +95,14 @@ module Log4r
     # 				should provide this underlying mapping, otherwise
     # 				all messages will be mapped to the underlying syslog
     # 				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' syslog levels, after instantiatin
+    # 				a syslogoutputter:
+    # 				<tt>SyslogOutputter.map_levels_by_name_to_syslog(
+    # 				{ "HIGH" => "ALERT", "MEDIUM" => "WARN", "LOW" => "INFO" }
+    # 				)</tt>
     def map_levels_by_name_to_syslog( lmap = SYSLOG_LOG4R_MAP )
       @levels_map = lmap
     end

data/src/log4r/outputter/tst.rb

@@ -0,0 +1,8 @@
+require 'syslog'
+include Syslog::Constants
+
+s1=Syslog.open( "test1", LOG_PID | LOG_CONS | LOG_PERROR, LOG_USER )
+s1.log( LOG_INFO, "%s", "test1 test1" )
+
+s2=Syslog.open( "test2", LOG_PID | LOG_CONS, LOG_USER )
+s2.log( LOG_INFO, "%s", "test2 test2" )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: log4r
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -41,12 +41,12 @@ files:
 - doc/images/log4r-logo.png
 - doc/images/logo2.png
 - doc/log4r.css
+- doc/rdoc-log4r.css
 - doc/templates/main.html
 - examples/customlevels.rb
 - examples/fileroll.rb
 - examples/log4r_yaml.yaml
 - examples/logclient.rb
-- examples/logs/simple.log
 - examples/logserver.rb
 - examples/moderate.xml
 - examples/moderateconfig.rb
@@ -59,6 +59,101 @@ files:
 - examples/syslogcustom.rb
 - examples/xmlconfig.rb
 - examples/yaml.rb
+- src/doc/created.rid
+- src/doc/images/brick.png
+- src/doc/images/brick_link.png
+- src/doc/images/bug.png
+- src/doc/images/bullet_black.png
+- src/doc/images/bullet_toggle_minus.png
+- src/doc/images/bullet_toggle_plus.png
+- src/doc/images/date.png
+- src/doc/images/find.png
+- src/doc/images/loadingAnimation.gif
+- src/doc/images/macFFBgHack.png
+- src/doc/images/package.png
+- src/doc/images/page_green.png
+- src/doc/images/page_white_text.png
+- src/doc/images/page_white_width.png
+- src/doc/images/plugin.png
+- src/doc/images/ruby.png
+- src/doc/images/tag_green.png
+- src/doc/images/wrench.png
+- src/doc/images/wrench_orange.png
+- src/doc/images/zoom.png
+- src/doc/index.html
+- src/doc/js/darkfish.js
+- src/doc/js/jquery.js
+- src/doc/js/quicksearch.js
+- src/doc/js/thickbox-compressed.js
+- src/doc/Log4r/base_rb.html
+- src/doc/Log4r/BasicFormatter.html
+- src/doc/Log4r/config_rb.html
+- src/doc/Log4r/ConfigError.html
+- src/doc/Log4r/Configurator.html
+- src/doc/Log4r/configurator_rb.html
+- src/doc/Log4r/DateFileOutputter.html
+- src/doc/Log4r/DefaultFormatter.html
+- src/doc/Log4r/EmailOutputter.html
+- src/doc/Log4r/FileOutputter.html
+- src/doc/Log4r/formatter/formatter_rb.html
+- src/doc/Log4r/formatter/patternformatter_rb.html
+- src/doc/Log4r/Formatter.html
+- src/doc/Log4r/IOOutputter.html
+- src/doc/Log4r/lib/drbloader_rb.html
+- src/doc/Log4r/lib/xmlloader_rb.html
+- src/doc/Log4r/Log4rConfig.html
+- src/doc/Log4r/Log4rTools.html
+- src/doc/Log4r/LogEvent.html
+- src/doc/Log4r/logevent_rb.html
+- src/doc/Log4r/Logger/LoggerFactory.html
+- src/doc/Log4r/Logger/Repository.html
+- src/doc/Log4r/Logger.html
+- src/doc/Log4r/logger_rb.html
+- src/doc/Log4r/loggerfactory_rb.html
+- src/doc/Log4r/LogServer.html
+- src/doc/Log4r/logserver_rb.html
+- src/doc/Log4r/ObjectFormatter.html
+- src/doc/Log4r/Outputter/consoleoutputters_rb.html
+- src/doc/Log4r/Outputter/datefileoutputter_rb.html
+- src/doc/Log4r/Outputter/emailoutputter_rb.html
+- src/doc/Log4r/Outputter/fileoutputter_rb.html
+- src/doc/Log4r/Outputter/iooutputter_rb.html
+- src/doc/Log4r/Outputter/outputter_rb.html
+- src/doc/Log4r/Outputter/OutputterFactory.html
+- src/doc/Log4r/Outputter/outputterfactory_rb.html
+- src/doc/Log4r/Outputter/remoteoutputter_rb.html
+- src/doc/Log4r/Outputter/rollingfileoutputter_rb.html
+- src/doc/Log4r/Outputter/staticoutputter_rb.html
+- src/doc/Log4r/Outputter/syslogoutputter_rb.html
+- src/doc/Log4r/Outputter/tst_rb.html
+- src/doc/Log4r/Outputter.html
+- src/doc/Log4r/PatternFormatter.html
+- src/doc/Log4r/rdoc/configurator.html
+- src/doc/Log4r/rdoc/emailoutputter.html
+- src/doc/Log4r/rdoc/formatter.html
+- src/doc/Log4r/rdoc/log4r.html
+- src/doc/Log4r/rdoc/logger.html
+- src/doc/Log4r/rdoc/logserver.html
+- src/doc/Log4r/rdoc/outputter.html
+- src/doc/Log4r/rdoc/patternformatter.html
+- src/doc/Log4r/rdoc/syslogoutputter.html
+- src/doc/Log4r/rdoc/yamlconfigurator.html
+- src/doc/Log4r/RemoteOutputter.html
+- src/doc/Log4r/repository_rb.html
+- src/doc/Log4r/RollingFileOutputter.html
+- src/doc/Log4r/ROMPClient.html
+- src/doc/Log4r/ROMPServer.html
+- src/doc/Log4r/RootLogger.html
+- src/doc/Log4r/SimpleFormatter.html
+- src/doc/Log4r/staticlogger_rb.html
+- src/doc/Log4r/StderrOutputter.html
+- src/doc/Log4r/StdoutOutputter.html
+- src/doc/Log4r/SyslogOutputter.html
+- src/doc/Log4r/YamlConfigurator.html
+- src/doc/Log4r/yamlconfigurator_rb.html
+- src/doc/Log4r.html
+- src/doc/rdoc.css
+- src/doc/REXML.html
 - src/log4r/base.rb
 - src/log4r/config.rb
 - src/log4r/configurator.rb
@@ -81,6 +176,7 @@ files:
 - src/log4r/outputter/rollingfileoutputter.rb
 - src/log4r/outputter/staticoutputter.rb
 - src/log4r/outputter/syslogoutputter.rb
+- src/log4r/outputter/tst.rb
 - src/log4r/rdoc/configurator
 - src/log4r/rdoc/emailoutputter
 - src/log4r/rdoc/formatter

data/examples/logs/simple.log

@@ -1 +0,0 @@
-FATAL simpleconf: kaboom!