spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove guard clause from config.exs

reset_fixes
Rick Carlino 2020-04-10 19:15:12 -05:00
parent ebb9ff41e7
commit 0fc39b1500
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
farmbot_core/lib/farmbot_core.ex
View File

@ -30,7 +30,7 @@ defmodule FarmbotCore do
{FarmbotFirmware, transport: FarmbotFirmware.StubTransport, side_effects: FarmbotCore.FirmwareSideEffects},
FarmbotCeleryScript.Scheduler
]
config = Application.get_env(:farmbot_ext, __MODULE__) || []
Keyword.get(config, :children, default)
config = (Application.get_env(:farmbot_ext, __MODULE__) || [])
Keyword.get(config, :children, default)
end
end

4
farmbot_os/config/config.exs
View File

@ -100,9 +100,7 @@ if Mix.target() == :host do
else
import_config("target/#{Mix.env()}.exs")
if File.exists?("config/target/#{Mix.target()}.exs") do
import_config("target/#{Mix.target()}.exs")
end
import_config("target/#{Mix.target()}.exs")
end
if Mix.env() == :test do