-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
162 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
require "./spec_helper" | ||
|
||
describe Logger do | ||
describe "#formatter=" do | ||
it "ensures backward compats" do | ||
io = IO::Memory.new | ||
logger = Logger.new(io) | ||
logger.formatter = Logger::Formatter.new do |severity, datetime, progname, message, io| | ||
io << severity.to_s << "," << message | ||
end | ||
logger.info "foo" | ||
io.to_s.should eq("INFO,foo\n") | ||
end | ||
|
||
it "also accepts String for handy settings" do | ||
io = IO::Memory.new | ||
logger = Logger.new(io) | ||
logger.formatter = "{{severity}},{{message}}" | ||
logger.info "foo" | ||
io.to_s.should eq("INFO,foo\n") | ||
end | ||
|
||
it "accepts '{{mark}}'" do | ||
apply("{{mark}}").should eq("I") | ||
end | ||
|
||
it "accepts '{{severity}}' and '{{level}}'" do | ||
apply("{{severity}}").should eq("INFO") | ||
apply("{{level}}").should eq("INFO") | ||
end | ||
|
||
it "accepts '{{datetime=FORMAT}}' and '{{time}}'" do | ||
apply("{{datetime=%Y}}").should eq(Time.now.to_s("%Y")) | ||
apply("{{time=%Y}}").should eq(Time.now.to_s("%Y")) | ||
end | ||
|
||
it "accepts '{{progname}}' and '{{prog}}'" do | ||
apply("{{progname}}").should eq("main") | ||
apply("{{prog}}").should eq("main") | ||
end | ||
|
||
it "accepts '{{message}}'" do | ||
apply("{{message}}").should eq("foo") | ||
end | ||
|
||
it "accepts '{{pid}}'" do | ||
apply("{{pid}}").should match(/^\d+$/) | ||
end | ||
|
||
it "accepts '{{KEYWORD=FORMAT}}'" do | ||
apply("{{severity}}").should eq("INFO") | ||
apply("{{severity=%5s}}").should eq(" INFO") | ||
apply("{{severity=%-5s}}").should eq("INFO ") | ||
end | ||
|
||
it "accepts '{{KEYWORD=FORMAT}}' and call format only when not empty" do | ||
apply("{{prog}}", "foo").should eq("foo") | ||
apply("{{prog=[%s]}}", "foo").should eq("[foo]") | ||
apply("{{prog=[%s]}}", "").should eq("") | ||
end | ||
|
||
it "leaves them alone for unknown keywords" do | ||
apply("{{xxx}}").should eq("{{xxx}}") | ||
end | ||
end | ||
end | ||
|
||
private def apply(fmt : String, prog = "main") : String | ||
io = IO::Memory.new | ||
logger = Logger.new(io) | ||
logger.formatter = fmt | ||
logger.info "foo", prog | ||
return io.to_s.chomp | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
# Add feature about `formatter=(str : String)` to `Logger` | ||
# | ||
# ```crystal | ||
# logger.formatter = "{{mark}}, [{{time=%H:%M}}] {{prog=[%s] }}{{message}}" | ||
# logger.info "foo", "main" # => "I, 23:57 [main] foo" | ||
# ``` | ||
class Logger | ||
def formatter=(str : String) | ||
@formatter = Logger::Formatter.new do |severity, datetime, progname, message, io| | ||
io << str.gsub(/\{\{([^=}]+)=?(.*?)\}\}/) { | ||
key = $1 | ||
fmt = $2.empty? ? nil : $2 | ||
begin | ||
v = case key | ||
when "mark" ; severity.to_s[0] | ||
when "severity", "level" ; severity | ||
when "datetime", "time" ; datetime | ||
when "progname", "prog" ; progname | ||
when "message" ; message | ||
when "pid" ; Process.pid | ||
else ; "{{#{key}}}" | ||
end | ||
if v.is_a?(Time) | ||
fmt ? v.to_s(fmt) : v.to_s | ||
else | ||
if fmt && !v.to_s.empty? | ||
fmt % v | ||
else | ||
v.to_s | ||
end | ||
end | ||
rescue err | ||
"{{#{key}:#{err}}}" | ||
end | ||
} | ||
end | ||
end | ||
end |