Commit graph

495 commits

Author SHA1 Message Date
Christopher Hoskin
65e1aba265 Update app.coffee to work with Metrics v2 2019-01-08 16:11:56 +00:00
Christopher Hoskin
85216fbd34 Update metrics to v2.0.12, logger to v1.5.9 and settings to v1.1.0, add npm-shrinkwrap 2019-01-08 16:08:40 +00:00
Henry Oswald
d88a40e383 Merge branch 'master' into ho-docker 2018-12-05 16:50:41 +00:00
Henry Oswald
0529493168 bump metrics 2018-12-05 16:50:20 +00:00
Henry Oswald
c3ec4a534e update config to take DOCUMENT_UPDATER_HOST 2018-12-05 16:49:15 +00:00
Alasdair Smith
a2ff9de0dd Use setting instead of hard-coding port 2018-10-09 11:51:18 +01:00
Henry Oswald
8d8319460e pass tmp path as env var 2018-10-04 11:14:15 +01:00
Henry Oswald
7893ace13f add aws creds 2018-10-04 10:40:34 +01:00
Henry Oswald
0a64983fb4 update config with full mongo conneciton and redis details 2018-10-04 10:34:44 +01:00
Henry Oswald
f26bebca4d update build scripts 2018-10-04 10:32:21 +01:00
Henry Oswald
fca95b5b27 dockerise app
- 1.1.3 build scripts
- add env vars for configuring s3
- add docker file
2018-05-24 12:02:27 +01:00
Alberto Fernández Capel
3de7970e0b Make travis read node version from .nvmrc file 2018-05-01 09:21:20 +01:00
James Allen
dd008e1c7d Provide hosts as environment settings and add npm run start script 2017-12-29 08:18:04 +00:00
Brian Gough
b9adad72be upgrade to ioredis 3 via redis-sharelatex 2017-10-30 11:09:25 +00:00
Brian Gough
dacc7ebabb exit if mock servers fail to start 2017-10-20 15:24:58 +01:00
Joe Green
67be2feb23 Update Jenkinsfile 2017-10-16 14:13:00 +01:00
Joe Green
90f2b85034 only alert on master 2017-10-12 16:57:06 +01:00
Joe Green
dbef5904be use correct node version in jenkinsfile 2017-09-20 15:46:48 +01:00
Joe Green
76cae1acf4 build.txt 2017-09-04 14:57:36 +01:00
Shane Kilkelly
1d0e0e68aa Merge branch 'master' into sk-node-6 2017-08-30 08:33:46 +01:00
Brian Gough
ca991c1efd fix broken unit test
the behaviour of the code changed so that raw ops are always compressed
2017-08-29 15:10:58 +01:00
Shane Kilkelly
1cd80b9dcd Restore a broken test that was commented out temporarily 2017-08-25 14:53:39 +01:00
Shane Kilkelly
ad43ddb6c6 Remove commented-out code 2017-08-25 14:52:14 +01:00
Shane Kilkelly
f6fdc5a827 Remove stray log 2017-08-25 14:50:33 +01:00
Shane Kilkelly
cd2ed24937 Fix WriteStream API 2017-08-25 14:47:07 +01:00
Shane Kilkelly
7c9ca7ccef Revert accidental change 2017-08-25 14:46:47 +01:00
Shane Kilkelly
095ac31347 wip: updating to node 6 2017-08-24 14:32:27 +01:00
Joe Green
004d1c134c Create Jenkinsfile 2017-08-16 10:39:03 +01:00
James Allen
b8d0eb2823 Merge branch 'master' into ja-return-latest-doc-on-no-version 2017-08-04 09:31:19 +02:00
James Allen
c5252f893b Don't return all updates if no version is given 2017-06-28 15:38:31 +01:00
Brian Gough
e8dfe3099f add missing callback for null byte check 2017-06-02 14:13:33 +01:00
Brian Gough
b71a15a6a0 null byte check for JSON.stringify in archiving 2017-06-01 13:36:13 +01:00
Brian Gough
d9763eb105 log corrupt updates 2017-05-23 13:55:10 +01:00
James Allen
c6d9df95f3 Merge pull request #38 from sharelatex/ja-redis-cluster
Migrate lock to be redis-cluster compatible
2017-05-16 14:16:43 +01:00
James Allen
fb6e028182 Migrate lock to be redis-cluster compatible 2017-05-15 10:34:24 +01:00
Brian Gough
756563fe42 Merge pull request #36 from sharelatex/bg-improve-archiving
make archiving less noisy
2017-05-10 14:18:18 +01:00
Brian Gough
ff76d1cf62 update to redis-sharelatex v1.0.2 2017-05-10 13:48:43 +01:00
Brian Gough
2781d9fd80 keep track of processed/total docs in archiving 2017-05-09 14:00:16 +01:00
Brian Gough
c26bccd390 make arguments handling for packworker more robust 2017-05-09 14:00:16 +01:00
Brian Gough
cac7556ad5 only check packs for archiving once each week 2017-05-09 14:00:15 +01:00
Brian Gough
c6e83c6cb8 allow archiving to exit properly on hard timeout 2017-05-09 14:00:15 +01:00
Brian Gough
9936710a1a replace error with warning for archiving timeout 2017-05-09 14:00:15 +01:00
Brian Gough
0e8a924f28 Merge pull request #35 from sharelatex/bg-fix-dangling
flush dangling docs
2017-05-05 15:03:41 +01:00
Brian Gough
7cd2911a0a Merge pull request #34 from sharelatex/bg-update-redis-sharelatex-to-v1.0.1
update redis-sharelatex to v1.0.1
2017-05-05 11:51:33 +01:00
Brian Gough
b82567ef79 support scan operations on redis cluster 2017-05-05 11:30:55 +01:00
Brian Gough
842b91b93a update redis-sharelatex to v1.0.1
manual edit to npm-shrinkwrap.json to preserve existing versions
2017-05-05 09:38:58 +01:00
Brian Gough
e0ed321d7b fix shrinkwrap file to add redis-sharelatex 2017-05-03 16:37:12 +01:00
Brian Gough
35810fa702 Revert "update shrinkwrap file"
This reverts commit d16d3a1db97049cd99bfd6d965e4fab77453ae67.
2017-05-03 16:32:23 +01:00
Brian Gough
534bd8f7ad add flushing code with error check for cluster 2017-05-02 14:19:49 +01:00
Brian Gough
0966f694da fix acceptance tests to work with redis cluster 2017-04-27 10:14:44 +01:00
Brian Gough
3b5a07d530 fix update to work with redis cluster
the items do not have the same tag, so we must delete the entry from the
docsWithHistoryOps set outside the multi.
2017-04-26 16:25:34 +01:00
Brian Gough
7836556d10 update shrinkwrap file 2017-04-24 14:24:02 +01:00
Brian Gough
3045becbb6 use redis-sharelatex with redis cluster config 2017-04-24 14:23:32 +01:00
Brian Gough
df38893538 remove old single redis flushing code 2017-04-24 11:36:31 +01:00
Brian Gough
a7ff15ec7d remove logging, fix query 2017-04-24 09:49:11 +01:00
Brian Gough
33fb1ddf57 script to flush dangling ops 2017-04-20 16:58:26 +01:00
Brian Gough
2a68b81cc1 randomise order of flush 2017-04-20 14:32:23 +01:00
Brian Gough
9eb36f9692 improve log message for flushing 2017-04-20 11:55:32 +01:00
Brian Gough
43f51355b2 add limit parameter to flushAll 2017-04-20 11:01:46 +01:00
Brian Gough
976f19f763 remove spurious call to getAllDocIdsWithHistoryOps 2017-04-20 10:14:44 +01:00
Brian Gough
70ce3a5271 Merge pull request #29 from sharelatex/bg-simple-flush-all
simple flush for all projects
2017-04-19 16:32:09 +01:00
Brian Gough
b5b61b98d0 avoid blocking when fetching redis keys
use scan instead of keys method
2017-04-19 15:39:33 +01:00
Brian Gough
9ce6d77cca add check for dangling updates 2017-04-13 11:31:45 +01:00
Brian Gough
1ec9f87542 update timeouts to allow for 5 second retry delay
now using requestretry module, which has a five second delay between
retries. Need to increase the timeout on the health checks to allow for
this, as the timeout is currently shorter than the retry delay.
2017-04-12 16:47:34 +01:00
Brian Gough
d9ed026d91 simple flush for all projects
does not work with redis cluster, only single redis
2017-04-12 16:34:28 +01:00
Shane Kilkelly
96f5802462 Merge branch 'sk-upgrade-metrics' 2017-04-04 16:16:37 +01:00
Shane Kilkelly
9a9f0f5c4d Remove the Metrics module, use metrics-sharelatex 2017-04-03 15:17:29 +01:00
Brian Gough
5d6d33966b Merge pull request #27 from sharelatex/bg-retry-web-api-request
use requestretry to work around web api timeouts
2017-04-03 14:05:07 +01:00
Brian Gough
7237467cb4 use requestretry to work around web api timeouts 2017-04-03 11:06:50 +01:00
Brian Gough
b0b05d1e1b improve error handling of releaseLock
ported from docupdater
2017-03-31 15:17:13 +01:00
Shane Kilkelly
b10f3adf2b mock out metrics in tests 2017-03-31 11:33:25 +01:00
Shane Kilkelly
9a84798293 Upgrade to latest metrics 2017-03-31 11:32:59 +01:00
Brian Gough
8bb3dd07a4 continue when ops are out of order 2017-03-30 13:37:11 +01:00
Brian Gough
d29141d583 return error when out-of-order ops detected 2017-03-30 11:48:26 +01:00
Brian Gough
70bb95fb36 update logger-sharelatex to v1.5.6 2017-03-30 09:41:42 +01:00
Brian Gough
28d2ec93b8 Revert "Revert "Merge pull request #23 from sharelatex/bg-move-lock""
This reverts commit 85bc45099f047aa8dfa6d189f02f4b4327c9d602.
2017-03-28 12:52:49 +01:00
Shane Kilkelly
5288814bd6 Merge branch 'master' of github.com:sharelatex/track-changes-sharelatex 2017-03-27 14:37:47 +01:00
Shane Kilkelly
715ccbe227 Add a .nvmrc file 2017-03-27 14:37:32 +01:00
Brian Gough
e745cce9f5 Revert "Revert "added v8-profiler to shrinkwrap""
This reverts commit 642641ff7b97034346d494101124bee616927ade.
2017-03-27 13:26:55 +01:00
Brian Gough
0130d3513d Revert "Revert "Merge pull request #24 from sharelatex/bg-add-profile""
This reverts commit a58cd0d787b51634caf694f9d858e638d27178b2.
2017-03-27 13:25:59 +01:00
Brian Gough
8bd3dcca75 Revert "Merge pull request #24 from sharelatex/bg-add-profile"
This reverts commit 8f507dcc9fbcd51072047c82a443137aaac0f377, reversing
changes made to 70abd7a155b396e3b44ce21ff8d36be6ad03a060.
2017-03-24 09:17:38 +00:00
Brian Gough
a73c8ba7b8 Revert "Merge pull request #23 from sharelatex/bg-move-lock"
This reverts commit 72e6756415e390a29fa784529453f926e5144358, reversing
changes made to 8f507dcc9fbcd51072047c82a443137aaac0f377.
2017-03-24 09:17:11 +00:00
Brian Gough
6ada7842a9 Revert "added v8-profiler to shrinkwrap"
This reverts commit 62d481b31ebed2a1714cdfcb037a9c1a9c053756.
2017-03-24 09:12:28 +00:00
Brian Gough
f1a66df4ad added v8-profiler to shrinkwrap 2017-03-23 17:01:01 +00:00
Brian Gough
7802bcc911 Revert "update shrinkwrap file for new npm package"
This reverts commit 68283e2650420c1cedc957b039b52766a8d4ce3c.
2017-03-23 16:57:48 +00:00
Brian Gough
a4cca1f948 update shrinkwrap file for new npm package 2017-03-23 14:21:39 +00:00
Brian Gough
e028de115e Merge pull request #23 from sharelatex/bg-move-lock
move lock inside web http calls
2017-03-23 13:42:52 +00:00
Brian Gough
b897afeb1c Merge pull request #24 from sharelatex/bg-add-profile
add /profile endpoint
2017-03-23 13:39:12 +00:00
Brian Gough
bc7815f7fc remove old processUncompressedUpdates method
replace with new per doc method
2017-03-22 16:59:52 +00:00
Brian Gough
b1c0ebbaae add withLock to processUncompressedUpdatesForDoc 2017-03-22 16:16:04 +00:00
Brian Gough
0dd668416d increase request timeout now it is outside lock 2017-03-22 16:02:50 +00:00
Brian Gough
04b82a49ef add /profile endpoint 2017-03-22 15:38:12 +00:00
Brian Gough
6795820933 move lock inside web http calls 2017-03-21 16:49:23 +00:00
Shane Kilkelly
d520c78ae3 Update metrics version to 1.7.0 2017-03-21 13:45:15 +00:00
James Allen
d60445adfc Pass undo flag to doc updater when restoring from history 2017-03-21 11:32:53 +00:00
Shane Kilkelly
7fbc08d68a Add logger stub to unit test 2017-03-21 09:27:47 +00:00
Shane Kilkelly
118511ae4a Remove commented-out code 2017-03-20 09:39:51 +00:00
Shane Kilkelly
fa7ee739bb Update to new metrics api 2017-03-17 14:58:35 +00:00
Shane Kilkelly
c30e672549 Merge branch 'master' into sk-upgrade-metrics 2017-03-16 15:17:57 +00:00
Shane Kilkelly
c303a1a386 wip: upgrade metrics 2017-03-16 15:17:38 +00:00