Auto-merge for PR #515 via VersionBot

Change the update retry to back off to the standard update check interval

CHANGELOG.md

@@ -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!
 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
 
 * 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]

package.json

@@ -1,7 +1,7 @@
 {
   "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.",
-  "version": "6.3.6",
+  "version": "6.3.7",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

src/application.coffee

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