Skip to content

Erlang interop - logger level and timestamp change #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chulkilee wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Erlang interop - logger level and timestamp change #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79081bc
feat: use erlang logger level
chulkilee Oct 11, 2020
3d03744
feat: use erlang time metadata
chulkilee Oct 11, 2020
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
29 changes: 25 additions & 4 deletions lib/metadata_logger.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,20 @@ defmodule MetadataLogger do
timestamp: ~N[2019-11-22 12:23:45.000678]
}

# use erl_level (available since Elixir 1.11)
iex> MetadataLogger.log_to_map(
...> :warn,
...> [foo: 1, foo: 2],
...> {{2019, 11, 22}, {12, 23, 45, 678}},
...> [erl_level: :warning]
...> )
%{
level: :warning,
message: %{foo: 2},
metadata: %{},
timestamp: ~N[2019-11-22 12:23:45.000678]
}

"""
@spec log_to_map(
Logger.level(),
Expand All @@ -163,8 +177,11 @@ defmodule MetadataLogger do
) ::
map()
def log_to_map(level, message, ts, metadata) do
with m <- Enum.into(metadata, %{}),
m <- Map.drop(m, [:error_logger, :mfa, :report_cb]),
m = Enum.into(metadata, %{})
{level, m} = Map.pop(m, :erl_level, level)
{time, m} = Map.pop(m, :time)

with m <- Map.drop(m, [:error_logger, :mfa, :report_cb]),
{app, m} <- Map.pop(m, :application),
{module, m} <- Map.pop(m, :module),
{function, m} <- Map.pop(m, :function),
Expand Down Expand Up @@ -195,7 +212,7 @@ defmodule MetadataLogger do
end
|> Map.put(:level, level)
|> Map.put(:message, transform_message(message))
|> Map.put(:timestamp, transform_timestamp(ts))
|> Map.put(:timestamp, transform_timestamp(time, ts))
end

defp nil_or_inspect(nil), do: nil
Expand All @@ -213,11 +230,15 @@ defmodule MetadataLogger do
defp transform_message(m) when is_list(m), do: IO.iodata_to_binary(m)
defp transform_message(m), do: to_string(m)

defp transform_timestamp({{y, month, d}, {h, minutes, s, mil}}) do
defp transform_timestamp(nil, {{y, month, d}, {h, minutes, s, mil}}) do
{:ok, dt} = NaiveDateTime.new(y, month, d, h, minutes, s, mil)
dt
end

defp transform_timestamp(time_ms, _) do
DateTime.from_unix!(time_ms, :microsecond)
end

defp scrub(map) do
map
|> Map.delete(:function)
Expand Down