app/controllers/extface/handler_controller.rb in extface-0.7.2 vs app/controllers/extface/handler_controller.rb in extface-0.7.3

@@ -68,17 +68,23 @@
       def stream_job
         response.headers['Content-Type'] = 'text/event-stream'
         # find current job or get new one
         Extface.redis_block do |r|
             start = Time.now
+            isRetry = false
             if job = device.jobs.active.find_by(id: cookies[:extface]) || device.jobs.active.try(:first)
               cookies.permanent[:extface] = job.id
               p "Processing job #{job.id}"
               list, data = r.blpop(job.id, timeout: 1)
-              while data
-                response.stream.write data
-                r.publish(job.id, "OK")
-                if (Time.now - start) > 1.8.seconds
+              while (data || !isRetry)
+                if data
+                  response.stream.write data
+                  r.publish(job.id, "OK")
+                  isRetry = false
+                else #retry
+                  isRetry = true
+                end
+                if (Time.now - start) > 2.8.seconds
                   p "############ Will continue next time"
                   break
                 end
                 list, data = r.blpop(job.id, timeout: 1)
               end