Report timeout problems, and fix retries

Fix getting model URLs
This commit is contained in:
Phoenix Eliot 2016-08-09 12:53:53 -07:00
parent c87f505759
commit d3db19dee3
2 changed files with 27 additions and 1 deletions

View file

@ -11,6 +11,7 @@ AudioPlayer = require 'lib/AudioPlayer'
app = require 'core/application'
World = require 'lib/world/world'
utils = require 'core/utils'
{sendContactMessage} = require 'core/contact'
LOG = false
@ -25,6 +26,8 @@ LOG = false
# LevelLoader depends on SuperModel retrying timed out requests, as these occasionally happen during play.
# If LevelLoader ever moves away from SuperModel, it will have to manage its own retries.
reportedLoadErrorAlready = false
module.exports = class LevelLoader extends CocoClass
constructor: (options) ->
@ -52,6 +55,7 @@ module.exports = class LevelLoader extends CocoClass
if @supermodel.finished()
@onSupermodelLoaded()
else
@loadTimeoutID = setTimeout @reportLoadError.bind(@), 30000
@listenToOnce @supermodel, 'loaded-all', @onSupermodelLoaded
# Supermodel (Level) Loading
@ -73,6 +77,25 @@ module.exports = class LevelLoader extends CocoClass
else
@level = @supermodel.loadModel(@level, 'level').model
@listenToOnce @level, 'sync', @onLevelLoaded
reportLoadError: ->
return if me.isAdmin() or /dev=true/.test(window.location?.href ? '') or reportedLoadErrorAlready
reportedLoadErrorAlready = true
context = email: me.get('email')
context.message = """
Automatic Report - Unable to Load Level (LevelLoader timeout)
URL: #{window?.location?.toString()}
These models are marked as having not loaded:
#{JSON.stringify(@supermodel.report().map (m) -> _.result(m.model, 'url'))}
Object.keys(supermodel.models):
#{JSON.stringify(Object.keys(@supermodel.models))}
"""
if $.browser
context.browser = "#{$.browser.platform} #{$.browser.name} #{$.browser.versionNumber}"
context.screenSize = "#{screen?.width ? $(window).width()} x #{screen?.height ? $(window).height()}"
context.subject = "Level Load Error: #{@work?.level?.name or 'Unknown Level'}"
context.levelSlug = @work?.level?.slug
sendContactMessage context
onLevelLoaded: ->
if not @sessionless and @level.isType('hero', 'hero-ladder', 'hero-coop', 'course')
@ -355,6 +378,7 @@ module.exports = class LevelLoader extends CocoClass
@onWorldNecessitiesLoaded() if @checkAllWorldNecessitiesRegisteredAndLoaded()
onWorldNecessityLoadFailed: (event) ->
@reportLoadError()
@trigger('world-necessity-load-failed', event)
checkAllWorldNecessitiesRegisteredAndLoaded: ->
@ -393,6 +417,7 @@ module.exports = class LevelLoader extends CocoClass
@supermodel.loadModel(model, resourceName)
onSupermodelLoaded: ->
clearTimeout @loadTimeoutID
return if @destroyed
console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms' if LOG
@loadLevelSounds()

View file

@ -309,8 +309,9 @@ class ModelResource extends Resource
@markFailed()
return @
@markLoading()
@model.loading = false # So fetchModel can run again
if @loadsAttempted > 0
console.log "Didn't load model in #{timeToWait}ms (attempt ##{@loadsAttempted}), trying again: ", this
console.log "Didn't load model in #{timeToWait}ms (attempt ##{@loadsAttempted}), trying again: ", _.result(@model, 'url')
@fetchModel()
@listenTo @model, 'error', (levelComponent, request) ->
if request.status not in [408, 504, 522, 524]