Ticket #2038: fix-chrome-17.patch

deluge/ui/web/js/deluge-all/EventsManager.js

@@ -91 +91 @@
     },
 
     onGetEventsSuccess: function(events) {
-        if (!events) return;
-        Ext.each(events, function(event) {
-            var name = event[0], args = event[1];
-            args.splice(0, 0, name);
-            this.fireEvent.apply(this, args);
-        }, this);
+        if (events) {
+            Ext.each(events, function(event) {
+                var name = event[0], args = event[1];
+                args.splice(0, 0, name);
+                this.fireEvent.apply(this, args);
+            }, this);
+        }
         if (this.running) this.getEvents();
     },
 

deluge/ui/web/json_api.py

@@ -385 +385 @@
 
         # Create a deferred to and check again in 100ms
         d = Deferred()
-        reactor.callLater(0.1, self._get_events, listener_id, 0, d)
+        reactor.callLater(0.1, self._get_events, listener_id, time.time(), d)
         return d
 
-    def _get_events(self, listener_id, count, d):
+    def _get_events(self, listener_id, start_time, d):
         if listener_id in self.__queue:
             queue = self.__queue[listener_id]
             del self.__queue[listener_id]
@@ -396 +396 @@
         else:
             # Prevent this loop going on indefinitely incase a client leaves
             # the page or disconnects uncleanly.
-            if count >= 3000:
+
+            # timeout after 5 seconds
+            if time.time() - start_time > 5:
+                log.warning("_get_events timing out after %f seconds" % (time.time() - start_time,))
                 d.callback(None)
             else:
-                reactor.callLater(0.1, self._get_events, listener_id, count + 1, d)
+                reactor.callLater(0.1, self._get_events, listener_id, start_time, d)
 
     def remove_listener(self, listener_id, event):
         """