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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,8 @@ config :logger, :error_log,
type: "my_type_of_app_or_node",
metadata: [
extra_fields: "go here"
],
ex_jsx_opts: [
<see ex_jsx documentation for options to pass to JSX.encode>
]
```
22 changes: 14 additions & 8 deletions lib/logger_logstash_backend.ex
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ defmodule LoggerLogstashBackend do
port: port,
type: type,
metadata: metadata,
socket: socket
socket: socket,
ex_jsx_opts: ex_jsx_opts
}
) do
fields = md
Expand All @@ -70,12 +71,15 @@ defmodule LoggerLogstashBackend do
year, month, day, hour, minute, second, (milliseconds * 1000)
)
ts = Timex.to_datetime ts, Timezone.local
{:ok, json} = JSX.encode %{
type: type,
"@timestamp": Timex.format!(ts, "{ISO:Extended}"),
message: to_string(msg),
fields: fields
}
{:ok, json} = JSX.encode(
%{
type: type,
"@timestamp": Timex.format!(ts, "{ISO:Extended}"),
message: to_string(msg),
fields: fields
},
ex_jsx_opts
)
:gen_udp.send socket, host, port, to_charlist(json)
end

Expand All @@ -89,6 +93,7 @@ defmodule LoggerLogstashBackend do
type = Keyword.get opts, :type, "elixir"
host = Keyword.get opts, :host
port = Keyword.get opts, :port
ex_jsx_opts = Keyword.get opts, :ex_jsx_opts, []
{:ok, socket} = :gen_udp.open 0
%{
name: name,
Expand All @@ -97,7 +102,8 @@ defmodule LoggerLogstashBackend do
level: level,
socket: socket,
type: type,
metadata: metadata
metadata: metadata,
ex_jsx_opts: ex_jsx_opts
}
end

Expand Down
21 changes: 21 additions & 0 deletions test/logger_logstash_backend_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ defmodule LoggerLogstashBackendTest do
:nothing_received = get_log()
end

test "can pass ex_jsx_options" do
conf_with_uescape
Logger.info "µ", [pid_key: self()]
json = get_log()
{:ok, data} = JSX.decode json
assert data["message"] === "µ"
end

defp get_log do
receive do
{:udp, _, _, _, json} -> json
Expand All @@ -101,4 +109,17 @@ defmodule LoggerLogstashBackendTest do
Map.fetch!(map1, key) == value
end)
end

defp conf_with_uescape do
Logger.configure_backend @backend, [
host: "127.0.0.1",
port: 10001,
level: :info,
type: "some_app",
metadata: [
some_metadata: "go here"
],
ex_jsx_opts: [:uescape]
]
end
end