diff --git a/lib/red_storm/dsl/bolt.rb b/lib/red_storm/dsl/bolt.rb index c3895ce..776cc44 100644 --- a/lib/red_storm/dsl/bolt.rb +++ b/lib/red_storm/dsl/bolt.rb @@ -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) diff --git a/lib/red_storm/dsl/spout.rb b/lib/red_storm/dsl/spout.rb index 4846742..91a2506 100644 --- a/lib/red_storm/dsl/spout.rb +++ b/lib/red_storm/dsl/spout.rb @@ -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) diff --git a/lib/red_storm/dsl/topology.rb b/lib/red_storm/dsl/topology.rb index 121bca2..a7c6417 100644 --- a/lib/red_storm/dsl/topology.rb +++ b/lib/red_storm/dsl/topology.rb @@ -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) diff --git a/lib/red_storm/loggable.rb b/lib/red_storm/loggable.rb index f7f12cd..ce46f07 100644 --- a/lib/red_storm/loggable.rb +++ b/lib/red_storm/loggable.rb @@ -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 diff --git a/spec/red_storm/dsl/bolt_spec.rb b/spec/red_storm/dsl/bolt_spec.rb index 52b05a1..7ea12ca 100644 --- a/spec/red_storm/dsl/bolt_spec.rb +++ b/spec/red_storm/dsl/bolt_spec.rb @@ -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 \ No newline at end of file +end diff --git a/spec/red_storm/dsl/spout_spec.rb b/spec/red_storm/dsl/spout_spec.rb index ece2a8d..ee61b4d 100644 --- a/spec/red_storm/dsl/spout_spec.rb +++ b/spec/red_storm/dsl/spout_spec.rb @@ -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 \ No newline at end of file +end