18 Commits

Author SHA1 Message Date
Nick Martin
459dac9cac Merge branch 'master' into meteor
conflicts hand resolved. deftemplate and liveui reverted to master, will re-do later.

Conflicts:
	admin/generate-dev-bundle.sh
	admin/install-s3.sh
	admin/manifest.json
	app/meteor/deploy.js
	app/meteor/meteor.js
	examples/leaderboard/leaderboard.js
	examples/unfinished/azrael/client/azrael.js
	examples/unfinished/azrael/model.js
	packages/liveui/liveui.js
	packages/templating/deftemplate.js
	packages/templating/html_scanner.js
	tests/minimongo/test.html
2012-01-18 16:14:54 -08:00
Nick Martin
06a14e6ad9 Even more robustness to socket.io weirdness. This one should be fixed in socket.io master, but the extra safety belt doesn't hurt. 2012-01-13 15:20:12 -08:00
Nick Martin
c5b5880cea Be even more defensive to socket.io weirdness. 2012-01-09 22:46:31 -08:00
Nick Martin
a9f58deb93 Cleanup socket a little more aggressively. Hopefully fixes hanging connection bug. 2012-01-09 14:42:42 -08:00
Nick Martin
3faff2de78 perl -pi -e 's/Sky/Meteor/g' **/* 2012-01-04 20:52:46 -08:00
Nick Martin
05794f5643 perl -pi -e 's/skybreak/meteor/g' **/* 2012-01-04 18:32:23 -08:00
Nick Martin
23cd5b6912 perl -pi -e 's/Skybreak/Meteor/g' **/* 2012-01-04 18:30:25 -08:00
Nick Martin
d38efe6345 Rework reactive logic for new Sky.deps API. 2011-12-19 16:53:14 -08:00
Nick Martin
60abb2090c Comment on constants per matt. 2011-12-15 23:59:57 -08:00
Nick Martin
cc60375468 Re-subscribe and reset the database when we reconnect. 2011-12-15 20:36:41 -08:00
Nick Martin
1801b33cf7 retransmit unacked messages when we reconnect again. 2011-12-15 16:48:03 -08:00
Nick Martin
1e956fcfe7 Hook up reconnect function to actually do something. 2011-12-14 21:41:13 -08:00
Nick Martin
2c24b1edf0 Expose retry_time in status. 2011-12-14 20:42:13 -08:00
Nick Martin
916a1147fc Real retry timeout logic. 2011-12-14 19:33:10 -08:00
Nick Martin
3787999ce8 Retry ourselves by starting a new socket.io connection each time. Still a WIP, but getting there. 2011-12-14 17:45:35 -08:00
Nick Martin
1bda75a203 Wire up reactivity to status(). 2011-12-13 21:55:46 -08:00
Nick Martin
918d15afdc Factor socket.io into stream package on the server as well. Much cleaner now. 2011-12-13 13:40:13 -08:00
Nick Martin
46effaa9b3 Factor stream out of livedata. Client side only. No functional changes. 2011-12-12 20:56:12 -08:00