Skip to content

Commit 8319628

Browse files
committed
Port more MicroLogging changes - remove log config from core
1 parent bd6a3ae commit 8319628

File tree

2 files changed

+14
-48
lines changed

2 files changed

+14
-48
lines changed

base/logging.jl

+13-47
Original file line numberDiff line numberDiff line change
@@ -433,64 +433,30 @@ current_logger() = current_logstate().logger
433433
"""
434434
SimpleLogger(stream=STDERR, min_level=Info)
435435
436-
Simplistic logger for logging all messages with level not less than `min_level`
437-
to `stream`.
436+
Simplistic logger for logging all messages with level greater than or equal to
437+
`min_level` to `stream`.
438438
"""
439439
struct SimpleLogger <: AbstractLogger
440440
stream::IO
441441
min_level::LogLevel
442442
end
443-
SimpleLogger(stream::IO=STDERR, level=Info) = SimpleLogger(stream, parse_level(level))
444-
445-
function configure_logging(logger::SimpleLogger; min_level=Info)
446-
SimpleLogger(logger.stream, parse_level(min_level))
447-
end
443+
SimpleLogger(stream::IO=STDERR, level=Info) = SimpleLogger(stream, level)
448444

449445
shouldlog(logger::SimpleLogger, level, args...) = !(level < logger.min_level)
450446

451447
min_enabled_level(logger::SimpleLogger) = logger.min_level
452448

453-
function handle_message(logger::SimpleLogger, level, msg, _module, group, id,
449+
function handle_message(logger::SimpleLogger, level, message, _module, group, id,
454450
filepath, line; kwargs...)
455-
println(logger.stream, "$level [$(basename(String(filepath))):$line]: $msg")
456-
end
457-
458-
459-
#-------------------------------------------------------------------------------
460-
# Logger configuration
461-
462-
parse_level(level) = level
463-
parse_level(level::String) = parse_level(Symbol(lowercase(level)))
464-
function parse_level(level::Symbol)
465-
if level == :belowminlevel return BelowMinLevel
466-
elseif level == :debug return Debug
467-
elseif level == :info return Info
468-
elseif level == :warn return Warn
469-
elseif level == :error return Error
470-
elseif level == :abovemaxlevel return AboveMaxLevel
471-
else
472-
throw(ArgumentError("Unknown log level $level"))
451+
levelstr = string(level)
452+
color = level < Info ? :blue :
453+
level < Warn ? :cyan :
454+
level < Error ? :yellow : :red
455+
print_with_color(color, logger.stream, first(levelstr), "- ", bold=true)
456+
print(logger.stream, replace(message, '\n', "\n| "))
457+
println(logger.stream, " -", levelstr, ":", _module, ":", basename(filepath), ":", line)
458+
for (key,val) in kwargs
459+
println(logger.stream, "| ", key, " = ", val)
473460
end
474461
end
475462

476-
"""
477-
configure_logging(args...; kwargs...)
478-
479-
Call `configure_logging` with the current logger, and update cached log
480-
filtering information.
481-
"""
482-
function configure_logging(args...; kwargs...)
483-
logger = configure_logging(current_logger(), args...; kwargs...)::AbstractLogger
484-
if haskey(task_local_storage(), :LOGGER_STATE)
485-
task_local_storage()[:LOGGER_STATE] = LogState(logger)
486-
else
487-
global _global_logstate = LogState(logger)
488-
end
489-
logger
490-
end
491-
492-
configure_logging(::AbstractLogger, args...; kwargs...) =
493-
throw(ArgumentError("No configure_logging method matches the provided arguments."))
494-
495-
496-
init_logging() = global_logger(SimpleLogger(STDERR))

base/sysimg.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ isdefined(Core, :Inference) && Docs.loaddocs(Core.Inference.CoreDocs.DOCS)
442442
function __init__()
443443
# Base library init
444444
reinit_stdio()
445-
init_logging()
445+
global_logger(SimpleLogger(STDERR))
446446
Multimedia.reinit_displays() # since Multimedia.displays uses STDOUT as fallback
447447
early_init()
448448
init_load_path()

0 commit comments

Comments
 (0)