Skip to content

Commit 47b195c

Browse files
authored
Merge pull request #330 from chadlwilson/1.2-add-missing-log-signature
[fix] Add missing 'debug' zero-argument logging signature
2 parents 2b569ab + 8dbcfe8 commit 47b195c

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

History.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.2.6 (UNRELEASED)
2+
3+
- Add missing block-only signature for debug logging
4+
15
## 1.2.5
26

37
- Fix use of jruby-rack under Java 8 (#324)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,11 @@ public IRubyObject debug(final ThreadContext context,
246246
return context.runtime.newBoolean( add(DEBUG, context, msg, block) );
247247
}
248248

249+
@JRubyMethod(name = "debug")
250+
public IRubyObject debug(final ThreadContext context, final Block block) {
251+
return debug(context, context.nil, block);
252+
}
253+
249254
//
250255
// :call-seq:
251256
// info(message)

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,26 @@
8686
expect(logger.warn?).to be true
8787
end
8888

89+
[:debug, :info, :warn, :error, :fatal].each do |level|
90+
it "logs at #{level} level" do
91+
logger.public_send(level, 'message')
92+
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
93+
94+
real_logger.reset
95+
logger.public_send(level, 'message') { 'ignored' }
96+
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
97+
98+
real_logger.reset
99+
logger.public_send(level, nil) { 'message' }
100+
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
101+
102+
103+
real_logger.reset
104+
logger.public_send(level) { 'message' }
105+
expect(real_logger.logged_content).to eql "#{level.to_s.upcase}: message\n"
106+
end
107+
end
108+
89109
it "disables real logger's formatting when formatter is set" do
90110
real_logger.formatting = true
91111
expect(real_logger.formatting?).to be true

0 commit comments

Comments
 (0)