jruby-gradle
/
redstorm
mirror of https://github.com/jruby-gradle/redstorm
1
0
Fork 0
Code Issues Releases Wiki Activity

Using SLF4J instead of Log4J

This commit is contained in:
Ariel S. Valentin 2014-07-22 13:40:53 -04:00 committed by Midpoint Applications
parent 353fdde2d2
commit d847f2ca77
6 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/red_storm/dsl/bolt.rb
View File

@ -19,7 +19,7 @@ module RedStorm
# DSL class methods
def self.log
@log ||= Java::OrgApacheLog4j::Logger.getLogger(self.name)
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
end
def self.output_fields(*fields)

2
lib/red_storm/dsl/spout.rb
View File

@ -20,7 +20,7 @@ module RedStorm
end
def self.log
@log ||= Java::OrgApacheLog4j::Logger.getLogger(self.name)
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
end
def self.output_fields(*fields)

2
lib/red_storm/dsl/topology.rb
View File

@ -102,7 +102,7 @@ module RedStorm
end
def self.log
@log ||= Java::OrgApacheLog4j::Logger.getLogger(self.name)
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
end
# def self.spout(spout_class, contructor_args = [], options = {}, &spout_block)

2
lib/red_storm/loggable.rb
View File

@ -4,7 +4,7 @@ module RedStorm
module Loggable
def self.log
@log ||= Java::OrgApacheLog4j::Logger.getLogger(self.name)
@log ||= Java::OrgSlf4j::LoggerFactory.get_logger(self.name)
end
def log

31
spec/red_storm/dsl/bolt_spec.rb
View File

@ -330,13 +330,14 @@ describe RedStorm::SimpleBolt do
# log specs are mostly the same ats in the spout specs. if these are modified, sync with spout
describe "log statement" do
module Java::OrgApacheLog4j end;
class Java::OrgApacheLog4j::Logger; end
module Java::OrgSlf4j end;
class Java::OrgSlf4j::Logger; end
class Java::OrgSlf4j::LoggerFactory; end
describe "in class" do
it "should proxy to storm log4j logger" do
logger = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Bolt1").and_return(logger)
logger = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger)
logger.should_receive(:info).with("test")
class Bolt1 < RedStorm::SimpleBolt
@ -345,10 +346,10 @@ describe RedStorm::SimpleBolt do
end
it "should use own class name as logger id" do
logger1 = mock(Java::OrgApacheLog4j::Logger)
logger2 = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Bolt1").and_return(logger1)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Bolt2").and_return(logger2)
logger1 = mock(Java::OrgSlf4j::Logger)
logger2 = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger1)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt2").and_return(logger2)
logger1.should_receive(:info).with("test1")
logger2.should_receive(:info).with("test2")
@ -363,8 +364,8 @@ describe RedStorm::SimpleBolt do
describe "in instance" do
it "should proxy to storm log4j logger" do
logger = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Bolt1").and_return(logger)
logger = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger)
class Bolt1 < RedStorm::SimpleBolt
on_init {log.info("test")}
@ -376,10 +377,10 @@ describe RedStorm::SimpleBolt do
end
it "should use own class name as logger id" do
logger1 = mock(Java::OrgApacheLog4j::Logger)
logger2 = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Bolt1").and_return(logger1)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Bolt2").and_return(logger2)
logger1 = mock(Java::OrgSlf4j::Logger)
logger2 = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt1").and_return(logger1)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Bolt2").and_return(logger2)
class Bolt1 < RedStorm::SimpleBolt
on_init {log.info("test1")}
@ -701,4 +702,4 @@ describe RedStorm::SimpleBolt do
end
end
end
end

31
spec/red_storm/dsl/spout_spec.rb
View File

@ -408,13 +408,14 @@ describe RedStorm::SimpleSpout do
# log specs are mostly the same ats in the bolt specs. if these are modified, sync with bolt
describe "log statement" do
module Java::OrgApacheLog4j end;
class Java::OrgApacheLog4j::Logger; end
module Java::OrgSlf4j end;
class Java::OrgSlf4j::Logger; end
class Java::OrgSlf4j::LoggerFactory; end
describe "in class" do
it "should proxy to storm log4j logger" do
logger = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Spout1").and_return(logger)
logger = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger)
logger.should_receive(:info).with("test")
class Spout1 < RedStorm::SimpleSpout
@ -423,10 +424,10 @@ describe RedStorm::SimpleSpout do
end
it "should use own class name as logger id" do
logger1 = mock(Java::OrgApacheLog4j::Logger)
logger2 = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Spout1").and_return(logger1)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Spout2").and_return(logger2)
logger1 = mock(Java::OrgSlf4j::Logger)
logger2 = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger1)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout2").and_return(logger2)
logger1.should_receive(:info).with("test1")
logger2.should_receive(:info).with("test2")
@ -441,8 +442,8 @@ describe RedStorm::SimpleSpout do
describe "in instance" do
it "should proxy to storm log4j logger" do
logger = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Spout1").and_return(logger)
logger = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger)
class Spout1 < RedStorm::SimpleSpout
on_init {log.info("test")}
@ -454,10 +455,10 @@ describe RedStorm::SimpleSpout do
end
it "should use own class name as logger id" do
logger1 = mock(Java::OrgApacheLog4j::Logger)
logger2 = mock(Java::OrgApacheLog4j::Logger)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Spout1").and_return(logger1)
Java::OrgApacheLog4j::Logger.should_receive("getLogger").with("Spout2").and_return(logger2)
logger1 = mock(Java::OrgSlf4j::Logger)
logger2 = mock(Java::OrgSlf4j::Logger)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout1").and_return(logger1)
Java::OrgSlf4j::LoggerFactory.should_receive("get_logger").with("Spout2").and_return(logger2)
class Spout1 < RedStorm::SimpleSpout
on_init {log.info("test1")}
@ -879,4 +880,4 @@ describe RedStorm::SimpleSpout do
end
end
end
end
end