Browse Source

fix for non existing atom

revert/attachment-cleanup
Alexander Strizhakov 4 years ago
parent
commit
6a0f0ac4a2
No known key found for this signature in database GPG Key ID: 22896A53AEF1381
2 changed files with 1 additions and 22 deletions
  1. +1
    -9
      lib/pleroma/config/config_db.ex
  2. +0
    -13
      test/config/transfer_task_test.exs

+ 1
- 9
lib/pleroma/config/config_db.ex View File

@@ -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)


+ 0
- 13
test/config/transfer_task_test.exs View File

@@ -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

Loading…
Cancel
Save