Skip to content
Open
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
14 changes: 11 additions & 3 deletions src/Logging.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@ type Logger
name::AbstractString
level::LogLevel
output::IO
moreinfo::Bool
parent::Logger

Logger(name::AbstractString, level::LogLevel, output::IO, parent::Logger) = new(name, level, output, parent)
Logger(name::AbstractString, level::LogLevel, output::IO) = (x = new(); x.name = name; x.level=level; x.output=output; x.parent=x)
Logger(name::AbstractString, level::LogLevel, output::IO, parent::Logger) = new(name, level, output, moreinfo, parent)
Logger(name::AbstractString, level::LogLevel, output::IO) = (x = new(); x.name = name; x.level=level; x.output=output; x.moreinfo=true; x.parent=x)
end

show(io::IO, logger::Logger) = print(io, "Logger(", join([logger.name,
logger.level,
logger.output,
logger.moreinfo,
logger.parent.name], ","), ")")

const _root = Logger("root", WARNING, STDERR)
Expand All @@ -48,7 +50,11 @@ for (fn,lvl,clr) in ((:debug, DEBUG, :cyan),

@eval function $fn(logger::Logger, msg...)
if $lvl >= logger.level
logstring = string(Libc.strftime("%d-%b %H:%M:%S",time()),":",$lvl, ":",logger.name,":", msg...,"\n")
if logger.moreinfo
logstring = string(Libc.strftime("%d-%b %H:%M:%S",time()),":",$lvl, ":",logger.name,":", msg...,"\n")
else
logstring = string($lvl, ": ", msg...,"\n")
end
if isa(logger.output, Base.TTY)
Base.print_with_color($(Expr(:quote, clr)), logger.output, logstring )
else
Expand All @@ -68,6 +74,7 @@ function configure(logger=_root; args...)
logger.parent = parent = val::Logger
logger.level = parent.level
logger.output = parent.output
logger.moreinfo = parent.moreinfo
end
end

Expand All @@ -76,6 +83,7 @@ function configure(logger=_root; args...)
tag == :output ? (logger.output = val::IO) :
tag == :filename ? (logger.output = open(val, "a")) :
tag == :level ? (logger.level = val::LogLevel) :
tag == :moreinfo ? (logger.moreinfo = val::Bool) :
tag == :override_info ? nothing : # handled below
tag == :parent ? nothing : # handled above
(Base.error("Logging: unknown configure argument \"$tag\""))
Expand Down
13 changes: 13 additions & 0 deletions test/moreinfo_test.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Logging

println()
println("Testing moreinfo")

@Logging.configure(level=Logging.INFO)
@info("This should appear with date, time and logger name")

@Logging.configure(level=Logging.INFO, moreinfo=false)
@info("This should appear without date, time and logger name")

@Logging.configure(level=Logging.INFO, moreinfo=true)
@info("This should appear with date, time and logger name")
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ include("log_test.jl")
include("macro_test1.jl")
include("macro_test2.jl")
include("macro_test3.jl")
include("moreinfo_test.jl")