diff --git a/VERSION b/VERSION index e254286a..d708e625 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.0-rc33 +10.0.0-rc34 diff --git a/farmbot_celery_script/lib/farmbot_celery_script/compilers/update_resource_compiler.ex b/farmbot_celery_script/lib/farmbot_celery_script/compilers/update_resource_compiler.ex index ee0c7b3d..01d67be1 100644 --- a/farmbot_celery_script/lib/farmbot_celery_script/compilers/update_resource_compiler.ex +++ b/farmbot_celery_script/lib/farmbot_celery_script/compilers/update_resource_compiler.ex @@ -1,4 +1,6 @@ defmodule FarmbotCeleryScript.Compiler.UpdateResource do + require FarmbotCore.Logger + alias FarmbotCeleryScript.{AST, DotProps} def update_resource(%AST{args: args, body: body}, _env) do @@ -7,10 +9,6 @@ defmodule FarmbotCeleryScript.Compiler.UpdateResource do variable = unquote(Map.fetch!(args, :resource)) update = unquote(unpair(body, %{})) - if update["y"] do - IO.puts(" In update_resource_compiler y is #{inspect(update["y"])}") - end - # Go easy on the API... case variable do %AST{kind: :identifier} -> @@ -32,6 +30,16 @@ defmodule FarmbotCeleryScript.Compiler.UpdateResource do end def do_update(%{pointer_id: id, pointer_type: kind}, update_params) do + y = update_params["y"] + + msg = + if y do + "In #{__MODULE__}, y is #{y}" + else + "#{__MODULE__} was not provided a y value" + end + + FarmbotCore.Logger.error(3, msg) FarmbotCeleryScript.SysCalls.update_resource(kind, id, update_params) end diff --git a/farmbot_core/lib/farmbot_core/asset/private.ex b/farmbot_core/lib/farmbot_core/asset/private.ex index 2c0c2eca..66b67d22 100644 --- a/farmbot_core/lib/farmbot_core/asset/private.ex +++ b/farmbot_core/lib/farmbot_core/asset/private.ex @@ -46,8 +46,20 @@ defmodule FarmbotCore.Asset.Private do # error being thrown. changeset = LocalMeta.changeset(local_meta, Map.merge(params, %{table: table, status: "dirty"})) try do - result = Repo.insert_or_update!(changeset) - %FarmbotCore.Asset.Private.LocalMeta{} = result + result = Repo.insert_or_update!(changeset) + if table == "points" do +y = asset.y + +msg = + if y do + "In #{__MODULE__}, y is #{y}" + else + "#{__MODULE__} was not provided a y value" + end + +FarmbotCore.Logger.error(3, msg) + + end result catch :error, %Sqlite.DbConnection.Error{ diff --git a/farmbot_os/lib/farmbot_os/sys_calls/resource_update.ex b/farmbot_os/lib/farmbot_os/sys_calls/resource_update.ex index bcfd6e93..b4b9165d 100644 --- a/farmbot_os/lib/farmbot_os/sys_calls/resource_update.ex +++ b/farmbot_os/lib/farmbot_os/sys_calls/resource_update.ex @@ -53,6 +53,16 @@ defmodule FarmbotOS.SysCalls.ResourceUpdate do end def update_resource(kind, id, params) when kind in @point_kinds do + y = params["y"] + + msg = + if y do + "In #{__MODULE__}, y is #{y}" + else + "#{__MODULE__} was not provided a y value" + end + + FarmbotCore.Logger.error(3, msg) notify_user_of_updates(kind, params) params = do_handlebars(params) point_update_resource(kind, id, params) @@ -69,21 +79,16 @@ defmodule FarmbotOS.SysCalls.ResourceUpdate do def point_update_resource(type, id, params) do with %{} = point <- Asset.get_point(id: id), {:ok, point} <- Asset.update_point(point, params) do - real_y = point.y + y = point.y - if params["y"] do - {desired_y, _} = Float.parse(params["y"]) - - if real_y != desired_y do - FarmbotCore.Logger.error(3, "Y does not match up #{__MODULE__}") - raise "Y WAS NOT Correct #{inspect({real_y, desired_y})} @@@@" + msg = + if y do + "In #{__MODULE__}, y is #{y}" else - IO.puts( - " point.y = \"#{real_y}\"" - ) + "#{__MODULE__} was not provided a y value" end - end + FarmbotCore.Logger.error(3, msg) _ = Private.mark_dirty!(point) :ok else