Merge pull request #6 from KronicDeth/pids

Inspect all field values that are pids

Author: marcelog

lib/logger_logstash_backend.ex

@@ -43,14 +43,18 @@ defmodule LoggerLogstashBackend do
       socket: socket
     }
   ) do
-    md = Enum.into(Keyword.merge(md, metadata), %{})
-    md = Map.put md, :pid, inspect(md.pid)
+    fields = md
+             |> Keyword.merge(metadata)
+             |> Enum.into(%{})
+             |> Map.put(:level, to_string(level))
+             |> inspect_pids
+
     ts = Timex.datetime(ts, :local)
     {:ok, json} = JSX.encode %{
       type: type,
       "@timestamp": Timex.format!(ts, "%FT%T%z", :strftime),
       message: to_string(msg),
-      fields: Map.put(md, :level, to_string(level))
+      fields: fields
     }
     :gen_udp.send socket, host, port, to_char_list(json)
   end
@@ -76,4 +80,15 @@ defmodule LoggerLogstashBackend do
       metadata: metadata
     }
   end
+
+  # inspects the argument only if it is a pid
+  defp inspect_pid(pid) when is_pid(pid), do: inspect(pid)
+  defp inspect_pid(other), do: other
+
+  # inspects the field values only if they are pids
+  defp inspect_pids(fields) when is_map(fields) do
+    Enum.into fields, %{}, fn {key, value} ->
+      {key, inspect_pid(value)}
+    end
+  end
 end

test/logger_logstash_backend_test.exs

@@ -61,6 +61,29 @@ defmodule LoggerLogstashBackendTest do
     assert (now - ts) < 1000
   end
 
+  test "can log pids" 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",
+      "level" => "info",
+      "module" => "Elixir.LoggerLogstashBackendTest",
+      "pid" => (inspect self),
+      "pid_key" => inspect(self),
+      "some_metadata" => "go here",
+      "line" => 65
+    }
+    assert contains?(data["fields"], expected)
+    {:ok, ts} = Timex.parse data["@timestamp"], "%FT%T%z", :strftime
+    ts = Timex.to_unix ts
+
+    now = Timex.to_unix Timex.DateTime.local
+    assert (now - ts) < 1000
+  end
+
   test "cant log when minor levels" do
     Logger.debug "hello world", [key1: "field1"]
     :nothing_received = get_log