Skip to content

Commit 9678e04

Browse files
committed
remove LoggerSilence emulation from JRuby::Rack::Logger
1 parent bebeec6 commit 9678e04

File tree

2 files changed

+1
-51
lines changed

2 files changed

+1
-51
lines changed

src/main/java/org/jruby/rack/ext/Logger.java

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,7 @@ public IRubyObject unknown(final ThreadContext context, final Block block) {
338338

339339
// def add(severity, message = nil, progname = nil, &block)
340340
@JRubyMethod(name = "add", required = 1, optional = 2)
341-
public IRubyObject add(final ThreadContext context,
342-
final IRubyObject[] args, final Block block) {
341+
public IRubyObject add(final ThreadContext context, final IRubyObject[] args, final Block block) {
343342
int severity = UNKNOWN;
344343
final IRubyObject sev = args[0];
345344
if ( ! sev.isNil() ) {
@@ -471,42 +470,6 @@ private void doLog(RubyString message) {
471470
logger.log( message );
472471
}
473472

474-
// LoggerSilence API :
475-
476-
private static boolean silencer = false; // we're NOT true by default!
477-
478-
@JRubyMethod(name= "silencer", meta = true)
479-
public static IRubyObject get_silencer(final ThreadContext context, final IRubyObject self) {
480-
return context.runtime.newBoolean(silencer);
481-
}
482-
483-
@JRubyMethod(name = "silencer=", meta = true)
484-
public static IRubyObject set_silencer(final ThreadContext context, final IRubyObject self,
485-
final IRubyObject value) {
486-
return context.runtime.newBoolean(silencer = value.isTrue());
487-
}
488-
489-
@JRubyMethod(name = "silence")
490-
public IRubyObject silence(final ThreadContext context, final Block block) {
491-
return doSilence(ERROR, context, block); // temp_level = Logger::ERROR
492-
}
493-
494-
@JRubyMethod(name = "silence", required = 1)
495-
public IRubyObject silence(final ThreadContext context, final IRubyObject temp_level, final Block block) {
496-
final int tempLevel = (int) temp_level.convertToInteger("to_i").getLongValue();
497-
return doSilence(tempLevel, context, block);
498-
}
499-
500-
private IRubyObject doSilence(final int tempLevel, final ThreadContext context, final Block block) {
501-
if ( silencer ) {
502-
// not implemented - on purpose!
503-
return block.yield(context, this);
504-
}
505-
else {
506-
return block.yield(context, this);
507-
}
508-
}
509-
510473
// (old) BufferedLogger API compatibility :
511474

512475
@JRubyMethod(name = "flush", alias = { "auto_flushing", "auto_flushing=" })

src/spec/ruby/jruby/rack/logger_spec.rb

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,6 @@
102102
expect( logger.class::FATAL ).to eql 4
103103
end
104104

105-
it 'is not silencable (by default)' do
106-
expect( JRuby::Rack::Logger.silencer ).to be false
107-
end
108-
109-
it 'supports silence with block' do
110-
called = nil
111-
logger.silence do |logger|
112-
called = true
113-
expect( logger ).to be logger
114-
end
115-
expect( called ).to be true
116-
end
117-
118105
describe JRuby::Rack::ServletLog do
119106
let(:servlet_context_logger) do
120107
org.jruby.rack.logging.ServletContextLogger.new(servlet_context)

0 commit comments

Comments
 (0)