Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-03-26 12:34:54 -07:00
commit ff959c48b2

View file

@ -95,7 +95,7 @@ module.exports = class Simulator extends CocoClass
onInfiniteLoop: -> onInfiniteLoop: ->
console.warn "Skipping infinitely looping game." console.warn "Skipping infinitely looping game."
@trigger 'statusUpdate', "Infinite loop detected; grabbing a new game in #{@retryDelayInSeconds} seconds." @trigger 'statusUpdate', "Infinite loop detected; grabbing a new game in #{@retryDelayInSeconds} seconds."
_.delay @cleanupAndSimulateAnotherTask, @retryDelayInMilliseconds _.delay @cleanupAndSimulateAnotherTask, @retryDelayInSeconds * 1000
processResults: (simulationResults) -> processResults: (simulationResults) ->
taskResults = @formTaskResultsObject simulationResults taskResults = @formTaskResultsObject simulationResults