Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.2.6 (UNRELEASED)

- Add missing block-only signature for debug logging

## 1.2.5

- Fix use of jruby-rack under Java 8 (#324)
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/jruby/rack/ext/Logger.java
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ public IRubyObject debug(final ThreadContext context,
return context.runtime.newBoolean( add(DEBUG, context, msg, block) );
}

@JRubyMethod(name = "debug")
public IRubyObject debug(final ThreadContext context, final Block block) {
return debug(context, context.nil, block);
}

//
// :call-seq:
// info(message)
Expand Down
20 changes: 20 additions & 0 deletions src/spec/ruby/jruby/rack/logger_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,26 @@
expect(logger.warn?).to be true
end

[:debug, :info, :warn, :error, :fatal].each do |level|
it "logs at #{level} level" do
logger.public_send(level, 'message')
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"

real_logger.reset
logger.public_send(level, 'message') { 'ignored' }
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"

real_logger.reset
logger.public_send(level, nil) { 'message' }
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"


real_logger.reset
logger.public_send(level) { 'message' }
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
end
end

it "disables real logger's formatting when formatter is set" do
real_logger.formatting = true
expect(real_logger.formatting?).to be true
Expand Down