ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-19 15:53:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show better logs for UpdatesLockedError

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver
2019-02-13 16:23:55 +00:00
parent 5ace459ad2
commit 5894a9baf3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/device-state.coffee
View File

@ -132,6 +132,7 @@ module.exports = class DeviceState extends EventEmitter
@router = createDeviceStateRouter(this) @router = createDeviceStateRouter(this)
@on 'apply-target-state-end', (err) -> @on 'apply-target-state-end', (err) ->
if err? if err?
if not (err instanceof UpdatesLockedError)
console.log("Apply error #{err}") console.log("Apply error #{err}")
else else
console.log('Apply success!') console.log('Apply success!')
@ -577,10 +578,14 @@ module.exports = class DeviceState extends EventEmitter
@failedUpdates += 1 @failedUpdates += 1
@reportCurrentState(update_failed: true) @reportCurrentState(update_failed: true)
if @scheduledApply? if @scheduledApply?
if not (err instanceof UpdatesLockedError)
console.log("Updating failed, but there's another update scheduled immediately: ", err) console.log("Updating failed, but there's another update scheduled immediately: ", err)
else else
delay = Math.min((2 ** @failedUpdates) * constants.backoffIncrement, @maxPollTime) delay = Math.min((2 ** @failedUpdates) * constants.backoffIncrement, @maxPollTime)
# If there was an error then schedule another attempt briefly in the future. # If there was an error then schedule another attempt briefly in the future.
if err instanceof UpdatesLockedError
console.log("Updates are locked, retrying in #{delay}ms...")
else
console.log('Scheduling another update attempt due to failure: ', delay, err) console.log('Scheduling another update attempt due to failure: ', delay, err)
@triggerApplyTarget({ force, delay, initial }) @triggerApplyTarget({ force, delay, initial })