ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-01 23:30:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1152 from balena-io/1080-cancelDelay-fn

Browse Source 
Handle cancelDelay not being a function
This commit is contained in:
CameronDiver 2019-11-28 15:58:27 +00:00 committed by GitHub
commit 1c51e923bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/device-state.coffee
View File

@ -469,8 +469,10 @@ module.exports = class DeviceState extends EventEmitter
if !@scheduledApply? || (isFromApi && @cancelDelay) if !@scheduledApply? || (isFromApi && @cancelDelay)
@scheduledApply = { force, delay } @scheduledApply = { force, delay }
if isFromApi if isFromApi
# Cancel promise delay if call came from api to prevent waiting due to backoff # Cancel promise delay if call came from api to
@cancelDelay() # prevent waiting due to backoff (and if we've
# previously setup a delay)
@cancelDelay?()
else else
# If a delay has been set it's because we need to hold off before applying again, # If a delay has been set it's because we need to hold off before applying again,
# so we need to respect the maximum delay that has been passed # so we need to respect the maximum delay that has been passed