Merge pull request #393 from devonestes/config-improvements

Cache environment config in application config

Author: mitchellhenke

lib/sentry/config.ex

@@ -140,30 +140,37 @@ defmodule Sentry.Config do
     check_dsn = Keyword.get(opts, :check_dsn, true)
     type = Keyword.get(opts, :type)
 
-    environment_result =
-      case get_from_application_environment(key) do
-        {:ok, value} -> {:ok, value}
-        :not_found -> get_from_system_environment(config_key_to_system_environment_key(key))
+    result =
+      with :not_found <- get_from_application_environment(key),
+           env_key = config_key_to_system_environment_key(key),
+           system_func = fn -> get_from_system_environment(env_key) end,
+           :not_found <- save_system_to_application(key, system_func) do
+        if check_dsn do
+          query_func = fn -> key |> Atom.to_string() |> get_from_dsn_query_string() end
+          save_system_to_application(key, query_func)
+        else
+          :not_found
+        end
       end
 
-    result =
-      case environment_result do
-        {:ok, value} ->
-          {:ok, value}
+    convert_type(result, type, default)
+  end
 
-        :not_found ->
-          if(check_dsn, do: get_from_dsn_query_string(Atom.to_string(key)), else: :not_found)
-      end
+  defp save_system_to_application(key, func) do
+    case func.() do
+      :not_found ->
+        :not_found
 
-    case result do
-      {:ok, value} -> convert_type(value, type)
-      :not_found -> default
+      {:ok, value} ->
+        Application.put_env(:sentry, key, value)
+        {:ok, value}
     end
   end
 
-  defp convert_type(value, nil), do: value
-  defp convert_type(value, :list) when is_list(value), do: value
-  defp convert_type(value, :list) when is_binary(value), do: String.split(value, ",")
+  defp convert_type({:ok, value}, nil, _), do: value
+  defp convert_type({:ok, value}, :list, _) when is_list(value), do: value
+  defp convert_type({:ok, value}, :list, _) when is_binary(value), do: String.split(value, ",")
+  defp convert_type(_, _, default), do: default
 
   defp get_from_application_environment(key) when is_atom(key) do
     case Application.fetch_env(:sentry, key) do

test/config_test.exs

@@ -4,15 +4,24 @@ defmodule Sentry.ConfigTest do
   alias Sentry.Config
 
   test "retrieves from application environment" do
-    modify_env(:sentry, dsn: "https://public:[email protected]/1")
-
-    assert "https://public:[email protected]/1" == Config.dsn()
+    dsn = "https://public:[email protected]/1"
+    modify_env(:sentry, dsn: dsn)
+    assert dsn == Config.dsn()
   end
 
   test "retrieves from system environment" do
-    modify_system_env(%{"SENTRY_DSN" => "https://public:[email protected]/1"})
+    dsn = "https://public:[email protected]/1"
+    modify_system_env(%{"SENTRY_DSN" => dsn})
+
+    assert dsn == Config.dsn()
+  end
 
-    assert "https://public:[email protected]/1" == Config.dsn()
+  test "sets application env if found in system env" do
+    dsn = "https://public:[email protected]/1"
+    modify_system_env(%{"SENTRY_DSN" => dsn})
+
+    assert Config.dsn() == dsn
+    assert Application.get_env(:sentry, :dsn) == dsn
   end
 
   test "retrieves from DSN query string" do
@@ -24,6 +33,16 @@ defmodule Sentry.ConfigTest do
     assert "my_server" == Config.server_name()
   end
 
+  test "sets application env if found in DSN query string" do
+    modify_env(
+      :sentry,
+      dsn: "https://public:[email protected]/2?server_name=my_server"
+    )
+
+    assert "my_server" == Config.server_name()
+    assert Application.get_env(:sentry, :server_name) == "my_server"
+  end
+
   describe "source_code_path_pattern" do
     test "retrieves from environment" do
       modify_env(:sentry, source_code_path_pattern: "**/*test.ex")