log4r 1.1.7 → 1.1.8

data/examples/logs/TestTime000013.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 20
+ INFO WbExplorer: blah 21
+ INFO WbExplorer: blah 22
+ INFO WbExplorer: blah 23
+ INFO WbExplorer: blah 24
+ INFO WbExplorer: blah 25
+ INFO WbExplorer: blah 26
+ INFO WbExplorer: blah 27
+ INFO WbExplorer: blah 28
+ INFO WbExplorer: blah 29

data/examples/logs/TestTime000014.log

@@ -0,0 +1,9 @@
+ INFO WbExplorer: blah 30
+ INFO WbExplorer: blah 31
+ INFO WbExplorer: blah 32
+ INFO WbExplorer: blah 33
+ INFO WbExplorer: blah 34
+ INFO WbExplorer: blah 35
+ INFO WbExplorer: blah 36
+ INFO WbExplorer: blah 37
+ INFO WbExplorer: blah 38

data/examples/logs/TestTime000015.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 39
+ INFO WbExplorer: blah 40
+ INFO WbExplorer: blah 41
+ INFO WbExplorer: blah 42
+ INFO WbExplorer: blah 43
+ INFO WbExplorer: blah 44
+ INFO WbExplorer: blah 45
+ INFO WbExplorer: blah 46
+ INFO WbExplorer: blah 47
+ INFO WbExplorer: blah 48

data/examples/logs/TestTime000016.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 49
+ INFO WbExplorer: blah 50
+ INFO WbExplorer: blah 51
+ INFO WbExplorer: blah 52
+ INFO WbExplorer: blah 53
+ INFO WbExplorer: blah 54
+ INFO WbExplorer: blah 55
+ INFO WbExplorer: blah 56
+ INFO WbExplorer: blah 57
+ INFO WbExplorer: blah 58

data/examples/logs/TestTime000017.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 59
+ INFO WbExplorer: blah 60
+ INFO WbExplorer: blah 61
+ INFO WbExplorer: blah 62
+ INFO WbExplorer: blah 63
+ INFO WbExplorer: blah 64
+ INFO WbExplorer: blah 65
+ INFO WbExplorer: blah 66
+ INFO WbExplorer: blah 67
+ INFO WbExplorer: blah 68

data/examples/logs/TestTime000018.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 69
+ INFO WbExplorer: blah 70
+ INFO WbExplorer: blah 71
+ INFO WbExplorer: blah 72
+ INFO WbExplorer: blah 73
+ INFO WbExplorer: blah 74
+ INFO WbExplorer: blah 75
+ INFO WbExplorer: blah 76
+ INFO WbExplorer: blah 77
+ INFO WbExplorer: blah 78

data/examples/logs/TestTime000019.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 79
+ INFO WbExplorer: blah 80
+ INFO WbExplorer: blah 81
+ INFO WbExplorer: blah 82
+ INFO WbExplorer: blah 83
+ INFO WbExplorer: blah 84
+ INFO WbExplorer: blah 85
+ INFO WbExplorer: blah 86
+ INFO WbExplorer: blah 87
+ INFO WbExplorer: blah 88

data/examples/logs/TestTime000020.log

@@ -0,0 +1,10 @@
+ INFO WbExplorer: blah 89
+ INFO WbExplorer: blah 90
+ INFO WbExplorer: blah 91
+ INFO WbExplorer: blah 92
+ INFO WbExplorer: blah 93
+ INFO WbExplorer: blah 94
+ INFO WbExplorer: blah 95
+ INFO WbExplorer: blah 96
+ INFO WbExplorer: blah 97
+ INFO WbExplorer: blah 98

data/examples/logs/TestTime000021.log

@@ -0,0 +1 @@
+ INFO WbExplorer: blah 99

data/examples/logserver.rb

@@ -1,6 +1,6 @@
 # How to use LogServer
 
-$: << File.join('..','src')
+$: << File.join('..','lib')
 require 'log4r'
 require 'log4r/configurator'
 

data/examples/moderateconfig.rb

@@ -1,7 +1,7 @@
 # Now, for something more complicted
 # Let's pretend this is the global config file for our app
 
-$: << File.join('..','src')
+$: << File.join('..','lib')
 require "log4r"
 
 include Log4r                   # include Log4r to make things simple

data/examples/myformatter.rb

@@ -1,6 +1,6 @@
 # try out a custom formatter
 
-$: << '../src'
+$: << '../lib'
 
 require "log4r"
 

data/examples/outofthebox.rb

@@ -1,5 +1,5 @@
 # Here's how to start using log4r right away
-$: << File.join('..','src')                   # path if log4r not installed
+$: << File.join('..','lib')                   # path if log4r not installed
 require "log4r"
 
 Log = Log4r::Logger.new("outofthebox")        # create a logger

data/examples/rrsetup.rb

@@ -1,7 +1,7 @@
 # This is a real config file used by a game that I'm working on
 # The XML config file is called rrconfig.xml
 
-$: << File.join('..','src')
+$: << File.join('..','lib')
 require 'log4r'
 require 'log4r/configurator'
 include Log4r

data/examples/simpleconfig.rb

@@ -2,7 +2,7 @@
 # Where we configure just one logger and make it log to a file and stdout.
 
 # add the path to log4r if it isn't installed in a ruby path
-$: << File.join('..','src')
+$: << File.join('..','lib')
 require "log4r"
 
 # First things first, get the root logger and set its level to WARN.

data/examples/syslogcustom.rb

@@ -6,7 +6,7 @@
 # or have them all default to LOG_INFO
 # This file provides an example
 
-$: << '../src'
+$: << '../lib'
 
 require 'log4r'
 require 'log4r/configurator'

data/examples/xmlconfig.rb

@@ -1,7 +1,7 @@
 # This is like moderateconfig.rb, but using an XML config
 # please look at moderate.xml
 
-$: << '../src'
+$: << '../lib'
 
 require 'log4r'
 require 'log4r/configurator'

data/examples/yaml.rb

@@ -1,6 +1,6 @@
 # Log4r can be configured using YAML. This example uses log4r_yaml.yaml
 
-$: << File.join('..','src') # path if log4r is not installed
+$: << File.join('..','lib') # path if log4r is not installed
 require 'log4r'
 require 'log4r/yamlconfigurator'
 # we use various outputters, so require them, otherwise config chokes

data/{src → lib}/log4r.rb

@@ -3,7 +3,7 @@
 # == Other Info
 #
 # Author::      Leon Torres
-# Version::     $Id: log4r.rb,v 1.10 2010/03/12 17:54:27 colbygk Exp $
+# Version::     $Id$
 
 require "log4r/outputter/fileoutputter"
 require "log4r/outputter/consoleoutputters"
@@ -16,5 +16,5 @@ require "log4r/NDC"
 require "log4r/MDC"
 
 module Log4r
-  Log4rVersion = [1, 1, 7].join '.'
+  Log4rVersion = [1, 1, 8].join '.'
 end

data/{src → lib}/log4r/GDC.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: GDC.rb,v 1.4 2010/02/03 05:11:40 colbygk Exp $
+# Version:: $Id$
 # Author:: Colby Gutierrez-Kraybill <colby(at)astro.berkeley.edu>
 
 require 'monitor'

data/{src → lib}/log4r/MDC.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: MDC.rb,v 1.2 2010/01/12 08:19:30 colbygk Exp $
+# Version:: $Id$
 # Author:: Colby Gutierrez-Kraybill <colby(at)astro.berkeley.edu>
 
 require 'monitor'

data/{src → lib}/log4r/NDC.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: NDC.rb,v 1.5 2010/02/03 05:20:05 colbygk Exp $
+# Version:: $Id$
 # Author:: Colby Gutierrez-Kraybill <colby(at)astro.berkeley.edu>
 
 module Log4r

data/{src → lib}/log4r/config.rb

@@ -1,5 +1,5 @@
 # :nodoc:
-# Version:: $Id: config.rb,v 1.1.1.1 2004/03/19 03:31:06 fando Exp $
+# Version:: $Id$
 
 module Log4r
   module Log4rConfig #:nodoc:

data/{src → lib}/log4r/configurator.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 #
-# Version:: $Id: configurator.rb,v 1.1.1.1 2004/03/19 03:31:06 fando Exp $
+# Version:: $Id$
 
 require "log4r/logger"
 require "log4r/outputter/staticoutputter"

data/{src → lib}/log4r/formatter/formatter.rb

@@ -1,6 +1,6 @@
 # :include: ../rdoc/formatter
 #
-# Version:: $Id: formatter.rb,v 1.2 2009/09/19 05:16:43 colbygk Exp $
+# Version:: $Id$
 
 require "singleton"
 

data/{src → lib}/log4r/formatter/log4jxmlformatter.rb

@@ -1,61 +1,61 @@
-# :include: ../rdoc/log4jxmlformatter
-#
-# == Other Info
-#
-# Version:: $Id: log4jxmlformatter.rb,v 1.2 2010/03/11 23:38:22 colbygk Exp $
-
-require "log4r/formatter/formatter"
-
-require "rubygems"
-require "builder"
-
-module Log4r
-
-  class Log4jXmlFormatter < BasicFormatter
-    
-    def format(logevent)
-      logger = logevent.fullname.gsub('::', '.')
-      timestamp = (Time.now.to_f * 1000).to_i
-      level = LNAMES[logevent.level]
-      message = format_object(logevent.data)
-      exception = message if logevent.data.kind_of? Exception
-      file, line, method = parse_caller(logevent.tracer[0]) if logevent.tracer
-      
-      builder = Builder::XmlMarkup.new
-      xml = builder.log4j :event, :logger => logger,
-                                  :timestamp => timestamp,
-                                  :level => level,
-                                  :thread => '' do |e|
-              e.log4j :NDC, NDC.get
-              e.log4j :message, message
-              e.log4j :throwable, exception if exception
-              e.log4j :locationInfo, :class => '',
-                                     :method => method,
-                                     :file => file,
-                                     :line => line
-              e.log4j :properties do |p|
-                MDC.get_context.each do |key, value|
-                  p.log4j :data, :name => key, :value => value
-                end
-              end
-            end
-      xml
-    end
-
-    #######
-    private
-    #######
-
-    def parse_caller(line)
-      if /^(.+?):(\d+)(?::in `(.*)')?/ =~ line
-        file = Regexp.last_match[1]
-        line = Regexp.last_match[2].to_i
-        method = Regexp.last_match[3]
-        [file, line, method]
-      else
-        []
-      end
-    end
-  end
-
-end
+# :include: ../rdoc/log4jxmlformatter
+#
+# == Other Info
+#
+# Version:: $Id$
+
+require "log4r/formatter/formatter"
+
+require "rubygems"
+require "builder"
+
+module Log4r
+
+  class Log4jXmlFormatter < BasicFormatter
+    
+    def format(logevent)
+      logger = logevent.fullname.gsub('::', '.')
+      timestamp = (Time.now.to_f * 1000).to_i
+      level = LNAMES[logevent.level]
+      message = format_object(logevent.data)
+      exception = message if logevent.data.kind_of? Exception
+      file, line, method = parse_caller(logevent.tracer[0]) if logevent.tracer
+      
+      builder = Builder::XmlMarkup.new
+      xml = builder.log4j :event, :logger => logger,
+                                  :timestamp => timestamp,
+                                  :level => level,
+                                  :thread => '' do |e|
+              e.log4j :NDC, NDC.get
+              e.log4j :message, message
+              e.log4j :throwable, exception if exception
+              e.log4j :locationInfo, :class => '',
+                                     :method => method,
+                                     :file => file,
+                                     :line => line
+              e.log4j :properties do |p|
+                MDC.get_context.each do |key, value|
+                  p.log4j :data, :name => key, :value => value
+                end
+              end
+            end
+      xml
+    end
+
+    #######
+    private
+    #######
+
+    def parse_caller(line)
+      if /^(.+?):(\d+)(?::in `(.*)')?/ =~ line
+        file = Regexp.last_match[1]
+        line = Regexp.last_match[2].to_i
+        method = Regexp.last_match[3]
+        [file, line, method]
+      else
+        []
+      end
+    end
+  end
+
+end

data/{src → lib}/log4r/formatter/patternformatter.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 #
-# Version:: $Id: patternformatter.rb,v 1.9 2010/03/12 04:04:54 colbygk Exp $
+# Version:: $Id$
 
 require "log4r/formatter/formatter"
 require "log4r/GDC"
@@ -33,6 +33,7 @@ module Log4r
       "d" => 'format_date',
       "g" => 'Log4r::GDC.get()',
       "t" => '(event.tracer.nil? ? "no trace" : event.tracer[0])',
+      "T" => '(event.tracer.nil? ? "no trace" : event.tracer[0].split(File::SEPARATOR)[-1])',
       "m" => 'event.data',
       "h" => '(Thread.current[:name] or Thread.current.to_s)',
       "p" => 'Process.pid.to_s',
@@ -52,7 +53,7 @@ module Log4r
     # * $5 is the directive letter
     # * $6 is the stuff after the directive or "" if not applicable
   
-    DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdgtmhpMlxX%]))?(\{.+?\})?(.*)/
+    DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdgtTmhpMlxX%]))?(\{.+?\})?(.*)/
   
     # default date format
     ISO8601 = "%Y-%m-%d %H:%M:%S"

data/{src → lib}/log4r/logger.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: logger.rb,v 1.2 2009/09/24 04:58:28 colbygk Exp $
+# Version:: $Id$
 # Author:: Leon Torres <leon(at)ugcs.caltech.edu>
 
 require "log4r/outputter/outputter"
@@ -78,6 +78,11 @@ module Log4r
       @level
     end
 
+    # Return array of defined levels.
+    def levels
+      LNAMES
+    end
+
     # Set the additivity of the logger dynamically. True or false.
     def additive=(_additive)
       @additive = _additive

data/{src → lib}/log4r/loggerfactory.rb

@@ -1,5 +1,5 @@
 # :nodoc:
-# Version:: $Id: loggerfactory.rb,v 1.1.1.1 2004/03/19 03:31:07 fando Exp $
+# Version:: $Id$
 
 require "log4r/base"
 require "log4r/repository"

data/{src → lib}/log4r/outputter/emailoutputter.rb

@@ -7,22 +7,22 @@ require 'net/smtp'
 module Log4r
 
   class EmailOutputter < Outputter
-    attr_reader :server, :port, :domain, :acct, :authtype, :subject
+    attr_reader :server, :port, :domain, :acct, :authtype, :subject, :tls
 
     def initialize(_name, hash={})
       super(_name, hash)
       validate(hash)
       @buff = []
       begin 
-        Logger.log_internal {
-          "EmailOutputter '#{@name}' running SMTP client on #{@server}:#{@port}"
-        }
+	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
+	Logger.log_internal(-2) {
+	  "EmailOutputter '#{@name}' failed to start SMTP client!"
+	}
+	Logger.log_internal {e}
+	self.level = OFF
 	raise e
       end
     end
@@ -47,14 +47,14 @@ module Log4r
       _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
+	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
 
@@ -69,14 +69,15 @@ module Log4r
       @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
+      @authtype = (hash[:authtype] or hash['authtype'] or :cram_md5).to_s.to_sym
       @subject = (hash[:subject] or hash['subject'] or "Message of #{$0}")
+      @tls = (hash[:tls] or hash['tls'] or nil)
       @params = [@server, @port, @domain, @acct, @passwd, @authtype]
     end
 
     def canonical_log(event)
       synch {
-        @buff.push case @formatfirst
+	@buff.push case @formatfirst
           when true then @formatter.format event
           else event 
           end
@@ -99,20 +100,44 @@ module Log4r
         "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
+      begin
+  
+	smtp = Net::SMTP.new( @server, @port )
+
+        if ( @tls )
+
+	  # >1.8.7 has smtp_tls built in, 1.8.6 requires smtp_tls
+	  if RUBY_VERSION < "1.8.7" then
+	    begin
+	      require 'rubygems'
+	      require 'smtp_tls'
+	      smtp.enable_starttls if smtp.respond_to?(:enable_starttls)
+	    rescue LoadError => e
+	      Logger.log_internal(-2) {
+	        "EmailOutputter '#{@name}' unable to load smtp_tls, needed to support TLS on Ruby versions < 1.8.7"
+	      }
+	      raise e
+	    end
+	  else # RUBY_VERSION >= 1.8.7
+	    smtp.enable_starttls_auto if smtp.respond_to?(:enable_starttls_auto)
+	  end
+
+	end # if @tls
+
+        smtp.start(@domain, @acct, @passwd, @authtype) do |s|
+	  s.send_message(rfc822msg, @from, @to)
+        end
       rescue Exception => e
         Logger.log_internal(-2) {
-          "EmailOutputter '#{@name}' couldn't send email!"
+	  "EmailOutputter '#{@name}' couldn't send email!"
         }
         Logger.log_internal {e}
         self.level = OFF
-	raise e
+        raise e
       ensure @buff.clear
-      end
-    end
-  end
-end
+      end # begin
+    end # def send_mail
+  end # class EmailOutputter
+end # module Log4r