Skip to content

Commit

Permalink
LOGSTASH-302: setup log4j properties for elasticsearch
Browse files Browse the repository at this point in the history
  • Loading branch information
fetep authored and lusis committed Jan 10, 2012
1 parent e5f1ee9 commit 8bc728f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
42 changes: 42 additions & 0 deletions lib/logstash/logging.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
require "logger"

class LogStash::Logger < Cabin::Channel
attr_accessor :target

public
def initialize(*args)
super()
Expand All @@ -15,5 +17,45 @@ def initialize(*args)

#self[:program] = File.basename($0)
subscribe(::Logger.new(*args))
@target = args[0]
end # def initialize

def setup_log4j(logger="")
require "java"

#p = java.util.Properties.new(java.lang.System.getProperties())
p = java.util.Properties.new
log4j_level = "WARN"
case level
when :debug
log4j_level = "DEBUG"
when :info
log4j_level = "INFO"
end # case level
p.setProperty("log4j.rootLogger", "#{log4j_level},logstash")

case target
when STDOUT
p.setProperty("log4j.appender.logstash",
"org.apache.log4j.ConsoleAppender")
p.setProperty("log4j.appender.logstash.Target", "System.out")
when STDERR
p.setProperty("log4j.appender.logstash",
"org.apache.log4j.ConsoleAppender")
p.setProperty("log4j.appender.logstash.Target", "System.err")
else
p.setProperty("log4j.appender.logstash",
"org.apache.log4j.FileAppender")
p.setProperty("log4j.appender.logstash.File", target)
end # case target

p.setProperty("log4j.appender.logstash.layout",
"org.apache.log4j.PatternLayout")
p.setProperty("log4j.appender.logstash.layout.conversionPattern",
"log4j, [%d{yyyy-MM-dd}T%d{HH:mm:ss.SSS}] %5p: %c: %m%n")

org.apache.log4j.LogManager.resetConfiguration
org.apache.log4j.PropertyConfigurator.configure(p)
debug("log4j java properties setup", :log4j_level => log4j_level)
end
end # class LogStash::Logger
3 changes: 3 additions & 0 deletions lib/logstash/outputs/elasticsearch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ def register
require jar
end

# setup log4j properties for elasticsearch
@logger.setup_log4j

if @embedded
%w(host cluster bind_host).each do |name|
if instance_variable_get("@#{name}")
Expand Down

0 comments on commit 8bc728f

Please sign in to comment.