Skip to content

Commit

Permalink
Merge pull request #2 from curtd/fix_staticlogrecord_constructor
Browse files Browse the repository at this point in the history
fix: Fix type conversion in StaticLogRecordMetadata constructor
  • Loading branch information
curtd committed Jun 3, 2023
2 parents ebc9bdd + 44ab9ee commit c076875
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/records.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ log_level_name(meta::StaticLogRecordMetadata) = meta.level_name
_filename(line::LineNumberNode) = !isnothing(line.file) ? string(line.file) : nothing

function StaticLogRecordMetadata(source::AbstractString, level::LogLevel, level_name::String, filename::Union{String, Nothing}, line_num::Int, group=nothing, id=nothing)
return StaticLogRecordMetadata(string(source), level, something(level_name, ""), something(filename, "?"), line_num, group, id)
return StaticLogRecordMetadata(string(source), level, level_name, something(filename, "?"), line_num, group, id)
end

StaticLogRecordMetadata(source::AbstractString, level, lnn::LineNumberNode, args...) = StaticLogRecordMetadata(source, level, "", _filename(lnn), lnn.line, args...)

StaticLogRecordMetadata(source::AbstractString, level::LogLevel, filename::Union{LineNumberNode, String, Nothing}, line_num::Union{LineNumberNode, Int}, args...) = StaticLogRecordMetadata(source, level, nearest_log_level(level), filename, line_num, args...)
StaticLogRecordMetadata(source::AbstractString, level::LogLevel, filename::Union{LineNumberNode, String, Nothing}, line_num::Union{LineNumberNode, Int}, args...) = StaticLogRecordMetadata(source, level, string(nearest_log_level(level)), filename, line_num, args...)

StaticLogRecordMetadata(source::AbstractString, level::NamedLogLevel, args...) = StaticLogRecordMetadata(source, log_level(level), string(level), args...)

Expand Down
4 changes: 4 additions & 0 deletions test/TestLoggingCommon.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ module TestLoggingCommon
r = StaticLogRecordMetadata("source", LogLevel(0), "level_name", "filename", 1, "group", "id")
@test log_level(r) == LogLevel(0)
@test log_level_name(r) == "level_name"
r = StaticLogRecordMetadata("source", NamedLogLevel(:info), "filename", 1, "group", "id")
@test log_level(r) == Info
@test log_level_name(r) == "info"

end
@testset "RuntimeLogRecordMetadata" begin
datetime = DateTime(2023, 1, 1)
Expand Down

0 comments on commit c076875

Please sign in to comment.