416 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brian Gough	dff6e2c3da	bug fix in backoff	2017-05-16 16:31:28 +01:00
Brian Gough	c7d8fbbb8a	exponential backoff for lock up to maximum time	2017-05-16 15:22:02 +01:00
Brian Gough	0e0f4c34f0	Merge pull request #41 from sharelatex/revert-38-bg-load-doc-safely-in-lock ... Revert "fail safely if doc cannot be loaded"	2017-05-15 16:19:10 +01:00
Brian Gough	b15d2ef796	Revert "fail safely if doc cannot be loaded"	2017-05-15 16:18:40 +01:00
Paulo Jorge Reis	2c3f0aa6b4	Merge pull request #34 from sharelatex/pr-bulk-actions ... Add methods to bulk accept changes.	2017-05-15 15:14:33 +01:00
Brian Gough	f7a33528da	Merge pull request #38 from sharelatex/bg-load-doc-safely-in-lock ... fail safely if doc cannot be loaded	2017-05-15 11:46:24 +01:00
Paulo Reis	ef7fa59257	Update ranges tracker.	2017-05-15 11:11:14 +01:00
Paulo Reis	05d7d1b8c6	Merge branch 'master' into pr-bulk-actions	2017-05-15 10:35:16 +01:00
Paulo Reis	36d16a76e0	Unit test accept changes in the ranges manager.	2017-05-12 14:42:40 +01:00
Brian Gough	2ee40d0748	ensure document is in redis before consuming ops	2017-05-12 14:22:18 +01:00
Paulo Reis	d53266ea2d	Update web API stub.	2017-05-11 12:00:34 +01:00
Paulo Reis	5677c7ad9a	Update range tracker.	2017-05-11 11:31:19 +01:00
Paulo Reis	f690ef078a	Update tests; add new ones for multiple changes.	2017-05-09 16:16:25 +01:00
Brian Gough	42225ffc45	Merge pull request #36 from sharelatex/bg-atomic-history-update ... atomic history update	2017-05-09 13:15:54 +01:00
Brian Gough	36407ac726	rename HistoryManager pushUncompressedHistoryOps	2017-05-09 12:02:27 +01:00
Brian Gough	7ce6285e3d	increase flush threshold to 100 ops	2017-05-09 10:44:26 +01:00
Brian Gough	fdf5e8e0b8	get history ops length directly from redis update	2017-05-09 10:34:31 +01:00
Brian Gough	2d158b03d7	rename pushUncompressedHistoryOps	2017-05-09 09:32:56 +01:00
Paulo Reis	144804e516	Update tests with new methods.	2017-05-08 16:34:17 +01:00
Paulo Reis	d7ac57d054	Use new bulk method.	2017-05-08 16:08:42 +01:00
Paulo Reis	70341e4e80	Add bulk method from range tracker.	2017-05-08 16:08:34 +01:00
Brian Gough	e2f70aca1a	fix tests for redis cluster	2017-05-08 16:02:49 +01:00
Brian Gough	79d8fced49	make history update more atomic	2017-05-08 15:58:29 +01:00
Paulo Reis	e96e6d6a29	Remove unused method.	2017-05-05 15:17:19 +01:00
Paulo Reis	9b8a2c3030	Consolidate methods to accept changes.	2017-05-05 15:12:06 +01:00
James Allen	ce5b7957a5	Merge pull request #35 from sharelatex/ja-redis-cluster-refactor ... Bump redis-sharelatex version	2017-05-05 13:46:07 +01:00
James Allen	87a5e30a0b	Bump redis-sharelatex version	2017-05-05 13:37:58 +01:00
James Allen	b8b8a30710	Merge pull request #32 from sharelatex/ja-redis-cluster-refactor ... Use new redis-sharelatex instead of RedisBackend for cluster abstraction	2017-05-05 10:35:33 +01:00
James Allen	7456238a71	Bump redis-sharelatex version	2017-05-04 15:42:10 +01:00
Paulo Reis	d530ee9501	Add methods to bulk accept changes.	2017-05-04 15:32:54 +01:00
James Allen	5f93640077	Add scripts for testing cluster failover scenarios	2017-05-04 11:14:17 +01:00
James Allen	4104ca4889	Add in separate redis config for the lock and fix a few web -> realtime	2017-05-03 16:27:32 +01:00
James Allen	5c3661d6d9	Merge remote-tracking branch 'origin/bg-redis-cluster-refactor' into ja-redis-cluster-refactor	2017-05-02 15:39:54 +01:00
James Allen	ed493d8ad3	Rename web -> realtime for consistency with realtime	2017-05-02 15:38:33 +01:00
Brian Gough	64aef0b55a	fix acceptance test to work with redis cluster too	2017-04-27 10:42:43 +01:00
Brian Gough	dc77bc207d	change acceptance test to use redis history client	2017-04-24 16:31:23 +01:00
James Allen	c5449ae282	Split out redis config for real-time and track-changes into separate cluster-compatible configs	2017-04-13 17:00:42 +01:00
James Allen	f21208e841	Use new redis-sharelatex instead of RedisBackend for cluster abstraction	2017-04-12 14:53:03 +01:00
Brian Gough	fe5711ef07	Merge pull request #31 from sharelatex/bg-error-check-on-unlock ... add error check on unlock	2017-03-31 09:29:53 +01:00
Brian Gough	5583764d05	fix callback prototype in getLock	2017-03-30 15:31:47 +01:00
Brian Gough	c11618b475	improve unlock error handling	2017-03-30 15:31:34 +01:00
Brian Gough	b2b4bc44df	upgrade logger-sharelatex to v1.5.6	2017-03-30 14:16:35 +01:00
Brian Gough	20d27024b6	Merge pull request #30 from sharelatex/bg-log-pushed-ops ... log op versions pushed to track changes	2017-03-30 13:33:02 +01:00
Brian Gough	527c02a00b	log op versions pushed to track changes	2017-03-30 11:20:50 +01:00
Shane Kilkelly	64658d0034	Add a .nvmrc file	2017-03-27 14:50:09 +01:00
James Allen	51daffbc36	Merge pull request #29 from sharelatex/ja-support-undo-flag ... Support an incoming undo flag for history restores	2017-03-21 15:15:21 +00:00
James Allen	0245bfd031	Support an incoming undo flag for history restores	2017-03-21 11:20:38 +00:00
James Allen	a3a5524778	Fix broken unit test from merge	2017-03-20 10:37:02 +00:00
James Allen	c8f0d0920e	Merge pull request #28 from sharelatex/ja-cut-and-paste-comments ... Update RangeTracker to support upserting and moving comments for cut …	2017-03-20 10:29:37 +00:00
James Allen	199079a5b7	Merge branch 'master' into ja-cut-and-paste-comments	2017-03-20 10:29:01 +00:00