summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-01-24 12:22:26 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-01-24 12:22:26 +0300
commit6a0f0ac4a2a4387fd08c723a917216238f5fe8b3 (patch)
tree56a744258b41cfb7c61e0a12115ce54d51c1787a
parenta182d400d7d5aa414240b156965533c0e9b222d0 (diff)
downloadpleroma-6a0f0ac4a2a4387fd08c723a917216238f5fe8b3.tar.gz
pleroma-6a0f0ac4a2a4387fd08c723a917216238f5fe8b3.zip
fix for non existing atom
-rw-r--r--lib/pleroma/config/config_db.ex10
-rw-r--r--test/config/transfer_task_test.exs13
2 files changed, 1 insertions, 22 deletions
diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex
index be6688095..119251bee 100644
--- a/lib/pleroma/config/config_db.ex
+++ b/lib/pleroma/config/config_db.ex
@@ -236,15 +236,7 @@ defmodule Pleroma.ConfigDB do
end
@spec from_string(String.t()) :: atom() | no_return()
- def from_string(":" <> entity), do: String.to_existing_atom(entity)
-
- def from_string(entity) when is_binary(entity) do
- if is_module_name?(entity) do
- String.to_existing_atom("Elixir.#{entity}")
- else
- entity
- end
- end
+ def from_string(string), do: do_transform_string(string)
@spec convert(any()) :: any()
def convert(entity), do: do_convert(entity)
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs
index b9072e0fc..53e8703fd 100644
--- a/test/config/transfer_task_test.exs
+++ b/test/config/transfer_task_test.exs
@@ -105,17 +105,4 @@ defmodule Pleroma.Config.TransferTaskTest do
Application.put_env(:pleroma, :assets, assets)
end)
end
-
- test "non existing atom" do
- ConfigDB.create(%{
- group: ":pleroma",
- key: ":undefined_atom_key",
- value: [live: 2, com: 3]
- })
-
- assert ExUnit.CaptureLog.capture_log(fn ->
- TransferTask.start_link([])
- end) =~
- "updating env causes error, group: \":pleroma\" key: \":undefined_atom_key\" value: [live: 2, com: 3] error: %ArgumentError{message: \"argument error\"}"
- end
end