Skip to content

Removed all occurences of type for logstash 6.0.0 #19

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed all occurences of type for logstash 6.0.0 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfdc12c
Removed all occurences of type for logstash 6.0.0
yanlow Dec 13, 2017
fa066ee
Updated tests
yanlow Dec 13, 2017
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
4 changes: 0 additions & 4 deletions lib/logger_logstash_backend.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ defmodule LoggerLogstashBackend do
level, msg, ts, md, %{
host: host,
port: port,
type: type,
metadata: metadata,
socket: socket
}
Expand All @@ -71,7 +70,6 @@ defmodule LoggerLogstashBackend do
)
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
Expand All @@ -86,7 +84,6 @@ defmodule LoggerLogstashBackend do

level = Keyword.get opts, :level, :debug
metadata = Keyword.get opts, :metadata, []
type = Keyword.get opts, :type, "elixir"
host = Keyword.get opts, :host
port = Keyword.get opts, :port
{:ok, socket} = :gen_udp.open 0
Expand All @@ -96,7 +93,6 @@ defmodule LoggerLogstashBackend do
port: port,
level: level,
socket: socket,
type: type,
metadata: metadata
}
end
Expand Down
7 changes: 2 additions & 5 deletions test/logger_logstash_backend_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ defmodule LoggerLogstashBackendTest do
host: "127.0.0.1",
port: 10001,
level: :info,
type: "some_app",
metadata: [
some_metadata: "go here"
]
Expand All @@ -42,15 +41,14 @@ defmodule LoggerLogstashBackendTest do
Logger.info "hello world", [key1: "field1"]
json = get_log()
{:ok, data} = JSX.decode json
assert data["type"] === "some_app"
assert data["message"] === "hello world"
expected = %{
"function" => "test can log/1",
"level" => "info",
"module" => "Elixir.LoggerLogstashBackendTest",
"pid" => (inspect self()),
"some_metadata" => "go here",
"line" => 42,
"line" => 41,
"key1" => "field1"
}
assert contains?(data["fields"], expected)
Expand All @@ -65,7 +63,6 @@ defmodule LoggerLogstashBackendTest do
Logger.info "pid", [pid_key: self()]
json = get_log()
{:ok, data} = JSX.decode json
assert data["type"] === "some_app"
assert data["message"] === "pid"
expected = %{
"function" => "test can log pids/1",
Expand All @@ -74,7 +71,7 @@ defmodule LoggerLogstashBackendTest do
"pid" => (inspect self()),
"pid_key" => inspect(self()),
"some_metadata" => "go here",
"line" => 65
"line" => 63
}
assert contains?(data["fields"], expected)
{:ok, ts} = Timex.parse data["@timestamp"], "{ISO:Extended}"
Expand Down