spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Dont break FE during cooldown period

pull/862/head
Rick Carlino 2018-05-21 15:40:15 -05:00
parent f9d6966a02
commit f0cf36f846
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/device.rb
View File

@ -119,7 +119,7 @@ class Device < ApplicationRecord
update_attributes!(throttled_until: until_time, throttled_at: Time.now)
refresh_cache
cooldown = until_time.in_time_zone(self.timezone || "UTC").strftime("%I:%M%p")
cooldown_notice(THROTTLE_ON % [cooldown], until_time)
cooldown_notice(THROTTLE_ON % [cooldown], until_time, "warn")
end
end
@ -128,11 +128,11 @@ class Device < ApplicationRecord
old_time = throttled_until
update_attributes!(throttled_until: nil, throttled_at: Time.now)
refresh_cache
cooldown_notice(THROTTLE_OFF, old_time)
cooldown_notice(THROTTLE_OFF, old_time, "info")
end
end
def cooldown_notice(message, throttle_time, now = Time.current)
def cooldown_notice(message, throttle_time, type, now = Time.current)
hours = ((throttle_time - now) / 1.hour).round
tell(message, [(hours > 2) ? "email" : "toast"], "alert")
end