Conforming to SLF4J named hierarchy in loggers
This commit is contained in:
parent
d847f2ca77
commit
03de5d3456
|
@ -19,7 +19,7 @@ module RedStorm
|
||||||
# DSL class methods
|
# DSL class methods
|
||||||
|
|
||||||
def self.log
|
def self.log
|
||||||
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
|
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name.gsub(/::/,'.'))
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.output_fields(*fields)
|
def self.output_fields(*fields)
|
||||||
|
|
|
@ -20,7 +20,7 @@ module RedStorm
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.log
|
def self.log
|
||||||
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
|
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name.gsub(/::/,'.'))
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.output_fields(*fields)
|
def self.output_fields(*fields)
|
||||||
|
|
|
@ -102,7 +102,7 @@ module RedStorm
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.log
|
def self.log
|
||||||
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
|
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name.gsub(/::/,'.'))
|
||||||
end
|
end
|
||||||
|
|
||||||
# def self.spout(spout_class, contructor_args = [], options = {}, &spout_block)
|
# def self.spout(spout_class, contructor_args = [], options = {}, &spout_block)
|
||||||
|
|
|
@ -335,7 +335,7 @@ describe RedStorm::SimpleBolt do
|
||||||
class Java::OrgSlf4j::LoggerFactory; end
|
class Java::OrgSlf4j::LoggerFactory; end
|
||||||
|
|
||||||
describe "in class" do
|
describe "in class" do
|
||||||
it "should proxy to storm log4j logger" do
|
it "should proxy to storm slf4j logger" do
|
||||||
logger = mock(Java::OrgSlf4j::Logger)
|
logger = mock(Java::OrgSlf4j::Logger)
|
||||||
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger)
|
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger)
|
||||||
logger.should_receive(:info).with("test")
|
logger.should_receive(:info).with("test")
|
||||||
|
@ -363,7 +363,7 @@ describe RedStorm::SimpleBolt do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "in instance" do
|
describe "in instance" do
|
||||||
it "should proxy to storm log4j logger" do
|
it "should proxy to storm slf4j logger" do
|
||||||
logger = mock(Java::OrgSlf4j::Logger)
|
logger = mock(Java::OrgSlf4j::Logger)
|
||||||
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger)
|
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger)
|
||||||
|
|
||||||
|
@ -397,6 +397,22 @@ describe RedStorm::SimpleBolt do
|
||||||
bolt2 = Bolt2.new
|
bolt2 = Bolt2.new
|
||||||
bolt2.prepare(nil, nil, nil)
|
bolt2.prepare(nil, nil, nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "should conform to SLF4J Named Hierarchy when loading loggers" do
|
||||||
|
logger = mock(Java::OrgSlf4j::Logger)
|
||||||
|
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Named.Hierarchy.Bolt").and_return(logger)
|
||||||
|
module Named
|
||||||
|
module Hierarchy
|
||||||
|
class Bolt < RedStorm::SimpleBolt
|
||||||
|
on_init {log.info("test1")}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
logger.should_receive(:info).with("test1")
|
||||||
|
bolt = Named::Hierarchy::Bolt.new
|
||||||
|
bolt.prepare(nil, nil, nil)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -413,7 +413,7 @@ describe RedStorm::SimpleSpout do
|
||||||
class Java::OrgSlf4j::LoggerFactory; end
|
class Java::OrgSlf4j::LoggerFactory; end
|
||||||
|
|
||||||
describe "in class" do
|
describe "in class" do
|
||||||
it "should proxy to storm log4j logger" do
|
it "should proxy to storm slf4j logger" do
|
||||||
logger = mock(Java::OrgSlf4j::Logger)
|
logger = mock(Java::OrgSlf4j::Logger)
|
||||||
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger)
|
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger)
|
||||||
logger.should_receive(:info).with("test")
|
logger.should_receive(:info).with("test")
|
||||||
|
@ -441,7 +441,7 @@ describe RedStorm::SimpleSpout do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "in instance" do
|
describe "in instance" do
|
||||||
it "should proxy to storm log4j logger" do
|
it "should proxy to storm slf4j logger" do
|
||||||
logger = mock(Java::OrgSlf4j::Logger)
|
logger = mock(Java::OrgSlf4j::Logger)
|
||||||
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger)
|
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger)
|
||||||
|
|
||||||
|
@ -475,6 +475,22 @@ describe RedStorm::SimpleSpout do
|
||||||
spout2 = Spout2.new
|
spout2 = Spout2.new
|
||||||
spout2.open(nil, nil, nil)
|
spout2.open(nil, nil, nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "should conform to SLF4J Named Hierarchy when loading loggers" do
|
||||||
|
logger = mock(Java::OrgSlf4j::Logger)
|
||||||
|
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Named.Hierarchy.Spout").and_return(logger)
|
||||||
|
module Named
|
||||||
|
module Hierarchy
|
||||||
|
class Spout < RedStorm::SimpleSpout
|
||||||
|
on_init {log.info("test1")}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
logger.should_receive(:info).with("test1")
|
||||||
|
spout = Named::Hierarchy::Spout.new
|
||||||
|
spout.open(nil, nil, nil)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue