ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-21 10:01:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #515 via VersionBot

Browse Source 
Change the update retry to back off to the standard update check interval
This commit is contained in:
resin-io-versionbot[bot] 2017-10-25 03:44:36 +00:00 committed by GitHub
commit b809e2aa02
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## v6.3.7 - 2017-10-25
* Change the update retry to back off to the standard update check interval #515 [Pagan Gazzard]
## v6.3.6 - 2017-10-24 ## v6.3.6 - 2017-10-24
* Ensure preloaded apps are properly loaded by setting their internal markedForDeletion to false, and run apps that have it set to null #510 [Pablo Carranza Velez] * Ensure preloaded apps are properly loaded by setting their internal markedForDeletion to false, and run apps that have it set to null #510 [Pablo Carranza Velez]

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "name": "resin-supervisor",
"description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
"version": "6.3.6", "version": "6.3.7",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

2
src/application.coffee
View File

@ -830,7 +830,7 @@ application.update = update = (force, scheduled = false) ->
if updateStatus.state in [ UPDATE_REQUIRED, UPDATE_SCHEDULED ] if updateStatus.state in [ UPDATE_REQUIRED, UPDATE_SCHEDULED ]
console.log('Updating failed, but there is already another update scheduled immediately: ', err) console.log('Updating failed, but there is already another update scheduled immediately: ', err)
return return
delayTime = Math.min((2 ** updateStatus.failed) * 500, 30000) delayTime = Math.min((2 ** updateStatus.failed) * 500, config.appUpdatePollInterval)
# 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.
console.log('Scheduling another update attempt due to failure: ', delayTime, err) console.log('Scheduling another update attempt due to failure: ', delayTime, err)
setTimeout(update, delayTime, force, true) setTimeout(update, delayTime, force, true)