fix pychat message reordering

tylerharter · tylerharter · commit 207bb844e220 · 2016-07-06T14:52:53.000-04:00
diff --git a/applications/pychat/chat.py b/applications/pychat/chat.py
@@ -14,9 +14,19 @@ def msg(conn, event):
 
 def updates(conn, event):
     ts = event.get('ts', 0)
+    rows = list(r.db(CHAT).table(MSGS).filter(r.row[TS] > ts).run(conn))
+    if len(rows) == 0:
+        wait(conn, ts)
+        rows = list(r.db(CHAT).table(MSGS).filter(r.row[TS] > ts).run(conn))
+        assert(len(rows) > 0)
+    rows.sort(key=lambda row: row[TS])
+    return rows
+
+# TODO: have timeout
+def wait(conn, ts):
     for row in (r.db(CHAT).table(MSGS).filter(r.row[TS] > ts).
                 changes(include_initial=True).run(conn)):
-        return row['new_val']
+        break
 
 def handler(conn, event):
     fn = {'msg':     msg,
diff --git a/applications/pychat/static/main.js b/applications/pychat/static/main.js
@@ -30,9 +30,15 @@ function updates(ts) {
       html_error = data.error.replace(/\n/g, '<br/>');
       $("#comments").html("Error: <br/><br/>" + html_error + "<br/><br/>Consider refreshing.")
     } else {
-      //$("#comments").html(data.result.msg);
-      $("#comments").append(data.result.msg + "<br/>");
-      updates(data.result.ts);
+      var ts = 0;
+      for (var i = 0, len = data.result.length; i < len; i++) {
+	row = data.result[i];
+	$("#comments").append(row.msg + "<br/>");
+	if (row.ts > ts) {
+	  ts = row.ts;
+	}
+      }
+      updates(ts);
     }
   });
 }
diff --git a/util/setup.py b/util/setup.py
@@ -59,9 +59,7 @@ def main():
            (balancer['host_ip'], balancer['host_port'], app_name))
     wrjs(config_file, {'url': url})
 
-    #run additional scripts, if there are any
-    print '='*40
-    
+    # run additional scripts, if there are any
     if "init.py" in app_files:
         print '='*40
         print "Running init.py"
