fix for non existing atom

This commit is contained in:
Alexander Strizhakov 2020-01-24 12:22:26 +03:00
parent a182d400d7
commit 6a0f0ac4a2
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
2 changed files with 1 additions and 22 deletions

View File

@ -236,15 +236,7 @@ defmodule Pleroma.ConfigDB do
end end
@spec from_string(String.t()) :: atom() | no_return() @spec from_string(String.t()) :: atom() | no_return()
def from_string(":" <> entity), do: String.to_existing_atom(entity) def from_string(string), do: do_transform_string(string)
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
@spec convert(any()) :: any() @spec convert(any()) :: any()
def convert(entity), do: do_convert(entity) def convert(entity), do: do_convert(entity)

View File

@ -105,17 +105,4 @@ defmodule Pleroma.Config.TransferTaskTest do
Application.put_env(:pleroma, :assets, assets) Application.put_env(:pleroma, :assets, assets)
end) end)
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 end