Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'

#292 Replace try/rescue with File.Exists? in dev.exs

See merge request pleroma/pleroma!488
This commit is contained in:
lambda 2018-12-01 15:17:41 +00:00
commit a836d7b93a
1 changed files with 5 additions and 6 deletions

View File

@ -49,11 +49,10 @@ config :pleroma, Pleroma.Repo,
hostname: "localhost",
pool_size: 10
try do
if File.exists?("./config/dev.secret.exs") do
import_config "dev.secret.exs"
rescue
_ ->
IO.puts(
"!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
)
else
IO.puts(
"!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
)
end