Merge branch 'master' of https://github.com/codecombat/codecombat

app/views/play/spectate_view.coffee

@@ -458,10 +458,6 @@ module.exports = class SpectateLevelView extends View
         else
           cb(null, $.parseJSON(jqxhr.responseText))
 
-
-
-
-
   destroy: ()->
     @supermodel?.off 'error', @onLevelLoadError
     @levelLoader?.off 'loaded-all', @onLevelLoaderLoaded

server/commons/queue.coffee

@@ -185,7 +185,8 @@ class MongoQueue extends events.EventEmitter
   subscribe: (eventName, callback) -> @on eventName, callback
   unsubscribe: (eventName, callback) -> @removeListener eventName, callback
 
-
+  totalMessagesInQueue: (callback) -> @Message.count {}, callback
+    
   receiveMessage: (callback) ->
     conditions =
       queue: @queueName

server/queues/scoring.coffee

@@ -24,6 +24,14 @@ connectToScoringQueue = ->
       if error? then throw new Error  "There was an error registering the scoring queue: #{error}"
       scoringTaskQueue = data
       log.info "Connected to scoring task queue!"
+      
+module.exports.messagesInQueueCount = (req, res) ->
+  scoringTaskQueue.totalMessagesInQueue (err, count) ->
+    if err? then return errors.serverError res, "There was an issue finding the Mongoose count:#{err}"
+    response = String(count)
+    res.send(response)
+    res.end()
+
 
 module.exports.addPairwiseTaskToQueueFromRequest = (req, res) ->
   taskPair = req.body.sessions

server/routes/queue.coffee

@@ -9,6 +9,11 @@ module.exports.setup = (app) ->
   #app.post '/queue/scoring/pairwise', (req, res) ->
   #  handler = loadQueueHandler 'scoring'
   #  handler.addPairwiseTaskToQueue req, res
+  
+  app.get '/queue/messagesInQueueCount', (req, res) ->
+    handler = loadQueueHandler 'scoring'
+    handler.messagesInQueueCount req, res
+    
     
   app.all '/queue/*', (req, res) ->
     setResponseHeaderToJSONContentType res