Maybe fix FarmEvent - Sequence execution
This commit is contained in:
parent
b355aa4341
commit
9eb189ec44
|
@ -182,15 +182,6 @@ defmodule Farmbot.FarmEvent.Manager do
|
|||
# Checks if we shoudl run a sequence or not. returns {event | nil, time | nil}
|
||||
defp should_run_sequence?(calendar, last_time, now)
|
||||
|
||||
defp should_run_sequence?(nil, last_time, now) do
|
||||
Logger.debug 3, "Checking sequence with no calendar."
|
||||
if is_nil(last_time) do
|
||||
{true, now}
|
||||
else
|
||||
{false, last_time}
|
||||
end
|
||||
end
|
||||
|
||||
# if there is no last time, check if time is passed now within 60 seconds.
|
||||
defp should_run_sequence?([first_time | _], nil, now) do;
|
||||
|
||||
|
@ -207,6 +198,15 @@ defmodule Farmbot.FarmEvent.Manager do
|
|||
end
|
||||
end
|
||||
|
||||
defp should_run_sequence?(nil, last_time, now) do
|
||||
Logger.debug 3, "Checking sequence with no calendar."
|
||||
if is_nil(last_time) do
|
||||
{true, now}
|
||||
else
|
||||
{false, last_time}
|
||||
end
|
||||
end
|
||||
|
||||
defp should_run_sequence?(calendar, last_time, now) do
|
||||
# get rid of all the items that happened before last_time
|
||||
filtered_calendar = Enum.filter(calendar, fn(iso_time) ->
|
||||
|
|
Loading…
Reference in a new issue