Commit graph

299 commits

Author SHA1 Message Date
Christopher Hoskin
5dc2df2a70 Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-09 08:41:10 +00:00
Henry Oswald
06babdf789 remove inline maps 2018-12-11 14:49:29 +00:00
Henry Oswald
7358f91ea9 inline source maps, remove grunt, clean dev deps 2018-12-11 14:43:39 +00:00
Henry Oswald
b68d7d46a2 update coffeescript 2018-12-11 14:36:35 +00:00
Henry Oswald
36a0216f44 trying source context 2018-12-11 14:26:06 +00:00
Henry Oswald
3a963c1832 bump metrics 2018-12-11 14:17:38 +00:00
Henry Oswald
bd7a764b7e bump metrics 2018-12-10 22:04:16 +00:00
Henry Oswald
b8f3fbd1cf bump build script 2018-12-10 21:42:14 +00:00
Henry Oswald
30368dd8b9 try new mongo metrics 2018-11-27 12:07:40 +00:00
Henry Oswald
04cfb8fa0e use labels metrics 2018-11-26 09:47:05 +00:00
Henry Oswald
53654b3eaf bump metrics 2018-11-23 15:42:29 +00:00
Henry Oswald
4ea9328099 bump metrics 2018-11-20 17:17:29 +00:00
Henry Oswald
459d07dd69 bump metrics 2018-11-20 16:29:02 +00:00
Henry Oswald
56047f884c bump metrics 2018-11-20 16:14:14 +00:00
Henry Oswald
ff29557fb4 bump metrics version 2018-11-20 16:06:36 +00:00
Henry Oswald
f321341227 bump metrics to work with promethious 2018-11-20 14:58:19 +00:00
Henry Oswald
7e3c6ddb3f also delete doc ops 2018-10-19 12:10:33 +01:00
Henry Oswald
2ccc4d8d3f also delete doc ops 2018-10-19 11:54:19 +01:00
Henry Oswald
2828df74e5 hard delete a doc on health check 2018-10-18 18:06:05 +01:00
Henry Oswald
a756b1a967 hard delete a doc on health check 2018-10-03 14:57:01 +01:00
Henry Oswald
14073a6544 remove debug line 2018-09-28 13:31:49 +01:00
Henry Oswald
68a950a20c add debug line 2018-09-28 13:20:03 +01:00
Henry Oswald
7a90d49f42 add HEALTH_CHECK_PROJECT_ID 2018-09-28 12:39:11 +01:00
Henry Oswald
afc0058b87 update buildscripts to 1.1.9 2018-09-28 12:13:53 +01:00
Henry Oswald
94603f9855 use overleaf-ops project 2018-09-28 12:02:20 +01:00
Henry Oswald
ed4e2775c2 Merge branch 'ho-docker' of github.com:sharelatex/docstore-sharelatex into ho-docker 2018-09-28 11:59:39 +01:00
Henry Oswald
73171b80cf change mongo connection string temporaraly 2018-09-28 11:50:19 +01:00
Brian Gough
3d1e6fb28a increase body parser limit to 64kb
the 16kb limit is not enough when the doc has too many escape characters
2018-08-06 12:00:40 +01:00
Christopher Hoskin
e396b6b79e Update to Build Script 1.1.4 (draft 2) 2018-05-29 15:30:45 +01:00
Christopher Hoskin
ff9e67c87d Update to Build Script 1.1.4 (draft) 2018-05-29 13:59:19 +01:00
Henry Oswald
c334c224bf pass missing env var 2018-05-23 12:35:22 +01:00
Henry Oswald
bff7f96d70 standarise env vars 2018-05-23 12:32:37 +01:00
Henry Oswald
833bf67622 rewrite jenkins acceptence line 2018-05-23 12:29:16 +01:00
Henry Oswald
ddae704f88 log settings 2018-05-23 12:20:37 +01:00
Henry Oswald
984b5a0ca4 pass env vars all the way through (mvp) 2018-05-23 12:17:46 +01:00
Henry Oswald
a8f40a4fda remove env block 2018-05-23 11:45:50 +01:00
Henry Oswald
352a8d3f19 try withCredentials 2018-05-23 11:43:54 +01:00
Henry Oswald
37ef1ba816 add empty env block 2018-05-23 11:35:30 +01:00
Henry Oswald
c1947c5cbd dockerise app, 1.1.3 build scripts 2018-05-23 11:27:31 +01:00
Shane Kilkelly
cdfc6b6131 Merge pull request #30 from sharelatex/sk-upgrade-node-8
Upgrade NodeJS to version 6
2018-04-26 10:53:07 +01:00
Shane Kilkelly
0433692aec remove package-lock file 2018-04-26 10:34:05 +01:00
Shane Kilkelly
f0495d8ec6 Change to Node 6 2018-04-26 10:24:59 +01:00
Alberto Fernández-Capel
71256b58d2 Merge pull request #31 from sharelatex/afc-fix-travisci-build
Do not specify the node version in .travis.yml
2018-04-23 10:51:34 +01:00
Alberto Fernández Capel
6757f70daa Do not specify the node version in .travis.yml
So travis picks it from .nvmrc
2018-04-19 14:08:41 +01:00
Shane Kilkelly
dd7386bb54 Upgrade NodeJS to version 8 2018-04-16 14:44:59 +01:00
James Allen
f06bd26572 Add coffee script dependency 2017-12-29 10:35:40 +00:00
James Allen
a4cc02dbc3 Provide hosts as environment settings and add npm run start script 2017-12-29 08:12:31 +00:00
Joe Green
c864cd24bf Update Jenkinsfile 2017-10-16 14:09:54 +01:00
Joe Green
80eb7a8eda alert only on master 2017-10-12 17:07:29 +01:00
James Allen
d86a964081 Remove another verbose log object 2017-09-20 09:52:28 +02:00
James Allen
05a1939547 Don't log out doc lines and ranges 2017-09-20 09:42:08 +02:00
Joe Green
a0e33ae1e8 added build.txt 2017-09-04 14:48:21 +01:00
Shane Kilkelly
65697cb2f6 Upgrade sinonjs, and fix unit tests.
- use `sinon.match.has` for error matching
- restore previous use of `calledWith`
2017-08-22 15:20:43 +01:00
Shane Kilkelly
1f3b0a3713 Upgrade mongojs dependency to version 2.4.0
- Upgrade in package.json
- Use new connection syntax
- Fix unit tests, issues with object equality
2017-08-22 08:26:30 +01:00
Joe Green
172060c066 Use correct env vars 2017-08-14 15:44:40 +01:00
Joe Green
26ab98f04a run acceptance tests 2017-08-14 15:34:34 +01:00
Joe Green
ca42638ab3 Create Jenkinsfile 2017-08-11 11:09:41 +01:00
Brian Gough
abe90cad10 Revert "Merge pull request #23 from sharelatex/bg-optimise-get-all-docs"
This reverts commit c1337cf23f37bd9ba48419accf1f54c00390e0ea, reversing
changes made to fbb2fa15bf4239db006db742f906554d61a0eac4.
2017-06-30 14:54:11 +01:00
Brian Gough
a2ac37ac99 comments about optimistic loading 2017-06-28 10:06:50 +01:00
Brian Gough
b9b0596d83 optimistically load all docs 2017-06-27 16:58:20 +01:00
James Allen
e10d09d040 Merge pull request #22 from sharelatex/ja-archive-ranges
Archive ranges as well as doc lines
2017-05-17 12:02:42 +01:00
Shane Kilkelly
6a6fdc13a5 Merge branch 'sk-upgrade-metrics' 2017-04-04 09:34:45 +01:00
James Allen
7a64f040f1 Test and fix _mongoDocToS3Doc 2017-04-03 16:04:54 +01:00
James Allen
bf187f30ec Add tests for _s3DocToMongo 2017-04-03 15:50:33 +01:00
Shane Kilkelly
b14039715f Stub out logger in tests 2017-03-31 11:25:23 +01:00
Shane Kilkelly
f7bc400f22 upgrade to most recent metrics 2017-03-31 11:18:31 +01:00
James Allen
f94e33a3a9 Merge branch 'master' into ja-archive-ranges
Conflicts:
	app/coffee/DocArchiveManager.coffee
	test/acceptance/coffee/ArchiveDocsTests.coffee
2017-03-30 17:19:42 +01:00
James Allen
a9ab7b739d Archive ranges as well as doc lines 2017-03-30 17:13:43 +01:00
Shane Kilkelly
ce01b39967 Update metrics version to 1.7.0 2017-03-21 13:48:21 +00:00
Shane Kilkelly
bc37c844ea update to new metrics api 2017-03-17 15:27:36 +00:00
Shane Kilkelly
e879f9c742 Upgrade metrics 2017-03-16 16:46:58 +00:00
Henry Oswald
c0e23df82b break getDoc into multiple helpers, stop passing filters though from other calls 2017-03-15 22:09:56 +00:00
Henry Oswald
ffd1aa0ca4 just get doc_id for quick check to see if it exists 2017-03-10 11:45:03 +00:00
Henry Oswald
7adc67d13a add missing error handler 2017-03-10 10:37:11 +00:00
Henry Oswald
c2b96c7e1e Merge pull request #17 from sharelatex/ho-always-check-s3
Always get inS3 when getting doc
2017-03-10 10:36:59 +00:00
Henry Oswald
f067c039fe always search for inS3 when getting a doc 2017-03-09 18:51:54 +00:00
Henry Oswald
d6146b2970 got failing acceptence test 2017-03-09 18:18:50 +00:00
Henry Oswald
8bd0df3530 also log out lines in error message 2017-03-09 17:36:28 +00:00
Henry Oswald
dbfe5ac712 error if doc lines are not array when unarchiving 2017-03-09 17:34:33 +00:00
Shane Kilkelly
d09a4cb275 Lengthen sleep for acceptance tests 2017-03-06 15:11:04 +00:00
Shane Kilkelly
929ffbd83a Don't npm rebuild inside container 2017-02-20 10:07:30 +00:00
James Allen
315a1d5e80 Add ranges into health check 2017-01-31 10:23:51 +01:00
James Allen
fb39bb0442 Validate that ranges are present in a set document request 2017-01-19 12:15:14 +01:00
James Allen
5e730b33b2 Support new comment op format 2016-12-16 16:44:08 +00:00
James Allen
0174495f75 Add an end point to get all the ranges in a project 2016-12-09 14:37:24 +00:00
James Allen
6fa8b89154 Be explicit about the data we return from mongo 2016-12-05 17:27:31 +00:00
James Allen
a6ec672d84 Merge branch 'ja-delete-refactor' into ja-track-changes
Conflicts:
	test/acceptance/coffee/ArchiveDocsTests.coffee
2016-12-05 16:58:29 +00:00
James Allen
3d195de3e9 Improve testing of archiving and be explicit about include_deleted parameter 2016-12-05 16:48:01 +00:00
James Allen
7717625534 Include deleted docs when archiving 2016-12-05 16:31:51 +00:00
James Allen
2985cb587a Add tests for RangeManager 2016-12-05 15:38:38 +00:00
James Allen
b8a97731e4 Merge branch 'master' into ja-track-changes
Conflicts:
	test/acceptance/coffee/GettingAllDocsTests.coffee
2016-12-05 14:58:57 +00:00
James Allen
bd5086c054 Don't return deleted docs with all project docs 2016-12-05 14:37:44 +00:00
James Allen
0a65a5eabf Set and get ranges along with lines 2016-12-05 14:21:49 +00:00
James Allen
ca96d168dd Make attributes that can be set in mongo flexible 2016-12-02 15:22:08 +00:00
James Allen
144bae3a55 Add an error guard around the version being present 2016-12-02 15:17:38 +00:00
James Allen
ab527c3c5d remove code left over from migration 2016-12-02 15:02:54 +00:00
James Allen
e156d8017c Be explicit in version filter 2016-11-30 15:29:43 +00:00
James Allen
8b95a04a36 Don't look up version in mongo if not needed 2016-11-30 15:08:56 +00:00
James Allen
7ede096903 Merge branch 'master' into ja-set-version-in-docstore 2016-11-29 17:24:53 +00:00
James Allen
50f2983912 Log out version when updating doc 2016-11-29 16:49:35 +00:00
James Allen
10008fa9c4 Don't add colours in automated test script 2016-11-29 14:41:12 +00:00
James Allen
7204c08fb2 Rebuild npm modules as part of acceptance test docker run 2016-11-29 14:29:51 +00:00
James Allen
f7ba554658 set up acceptance tests to run via docker 2016-11-28 16:51:43 +00:00
James Allen
eb9a3b314a Set/get version in docOps via docstore HTTP API 2016-11-28 14:55:16 +00:00
Brian Gough
f95fc2f779 add route parameters 2016-09-05 11:14:41 +01:00
Brian Gough
7a28fb58e7 clean up mongo query 2016-09-05 11:14:41 +01:00
Brian Gough
0a0a8e23fe remove unused modules 2016-09-05 11:14:41 +01:00
Shane Kilkelly
56c0604b96 upgrade to node 4.2.1 2016-06-03 10:58:53 +01:00
Henry Oswald
1541eb319c add more null checks to health check 2015-12-02 10:10:52 +00:00
Henry Oswald
a964119b5e check err in health check and null check res 2015-12-01 21:50:18 +00:00
James Allen
7185657f06 Use max_doc_length rather than max_doc_size to be consistent with other services 2015-11-09 15:24:21 +00:00
James Allen
27d3ebc1fd Add configurable max_doc_length 2015-11-06 12:43:53 +00:00
Henry Oswald
29c812cece moved the build opts down 2015-10-16 12:57:05 +01:00
Henry Oswald
4f5669591a add timeout to health check requests and always try the delete 2015-10-16 12:30:53 +01:00
Henry Oswald
de9a24f7bb pulled health check into its own file and use project_id from settings 2015-10-16 10:13:54 +01:00
Henry Oswald
491d4c69b1 Merge branch 'master' of https://github.com/sharelatex/docstore-sharelatex 2015-10-15 22:22:44 +01:00
Henry Oswald
9826d125e3 added basic health check to docstore 2015-10-15 22:22:20 +01:00
James Allen
5fef2a82b8 Acceptance tests no longer run on Travis 2015-10-07 18:40:12 +01:00
Henry Oswald
f1bf0c97ec make archive and unarchive parallelLimit to speed it up 2015-09-22 09:41:26 +01:00
Henry Oswald
9cfa4b3f84 Don't put docs which are already in s3 through archive job
This fixes the bug we saw with 'RangeError: Maximum call stack size exceeded'
if lots of docs are already in s3 cb() gets called synchronously multiple times quickly
which can cause the execption. I am not sure where the recursion is, maybe inside async.

doing setImmediate(cb) also fixes the issue as I beilve it gives the
process chance to clear the stack. Similar to process.nextTick
2015-09-07 14:11:02 +01:00
Henry Oswald
ae75b855b4 added failing test for trying to archive load of docs which are already
in s3
2015-09-07 14:06:20 +01:00
Henry Oswald
738e33a052 change crypto to always use utf-8 as it works with aws 2015-09-01 16:52:02 +01:00
Henry Oswald
aaa2a099f1 change acceptance test to use big naught list of strings 2015-09-01 16:51:10 +01:00
Henry Oswald
192b0af15a added utf-8 char which fails the archive option 2015-09-01 15:47:16 +01:00
Henry Oswald
5dd33ea313 changed back to standard /archive /unarchive 2015-08-18 14:10:53 +01:00
Henry Oswald
5765b59e0c added /deactivate and /reactivate endpoints as web will call those
also fixed acceptence test
2015-08-18 13:31:26 +01:00
Henry Oswald
599b9770f4 add un archive endpoint 2015-08-13 22:48:45 +01:00
Henry Oswald
cf07e2fec5 improve archve doc acceptence tests 2015-08-13 22:48:17 +01:00
Henry Oswald
ef4e437c3f improve doc manager so it calls get doc recursivly 2015-08-13 22:47:33 +01:00
Henry Oswald
6ea284b17b Merge pull request #9 from sharelatex/s3-archive
S3 archive
2015-08-13 14:20:46 +01:00
Henry Oswald
32bf64236b fixed config to work with s3 correctly 2015-08-13 14:16:40 +01:00
Henry Oswald
ddf4692f0d added acceptance test for large doc ~1mb 2015-08-13 13:59:40 +01:00
Henry Oswald
b8884352f6 added some better error logging 2015-08-13 13:59:22 +01:00
Henry Oswald
859e8a0e57 - deal with calling archive twice on same project
- clean up unit tests
- change s3 keys
- use err not error
2015-08-13 13:00:09 +01:00
Henry Oswald
9af2c07c3b always add archiving root in 2015-08-13 12:59:04 +01:00
Brian Gough
aa599b0d90 added event loop monitor 2015-06-23 13:55:33 +01:00
Henry Oswald
6e4ad90cac bumped mongojs version 2015-06-10 15:37:06 +01:00
Henrique Dias
42f2afc4dd remove unarchived docs from s3 2015-06-03 20:05:15 -03:00
Henrique Dias
9a68bfb393 fix unit tests 2015-06-03 12:00:08 -03:00
Henrique Dias
aa23c1da56 md5 check for doc lines 2015-06-03 11:45:47 -03:00
Henrique Dias
5ba14522da handling error 2015-06-02 20:08:50 -03:00
Henrique Dias
a26320013d more acceptance tests 2015-06-02 19:24:45 -03:00
Henrique Dias
0cd2120430 more unit tests for archive feature 2015-06-02 18:13:16 -03:00
Henrique Dias
6add9a0da7 init unit tests 2015-06-02 17:12:11 -03:00
Henrique Dias
5c31e80062 more refactoring 2015-06-02 16:29:32 -03:00
Henrique Dias
ddd26798f1 refactoring
s3 filter in router
2015-06-02 15:55:22 -03:00
Henrique Dias
86f16caeef fix some issues 2015-06-02 15:13:28 -03:00
Henry Oswald
ea92f57acc point where we unset doc lines also search on doc rev to make sure
the document has not been updated
2015-06-02 12:39:49 +01:00
Henry Oswald
60bc7bf4e1 pulled logic for arching docs arpart a bit, can be moved into its own file
hacked out (needs tests) the unarchiving of individual docs & doc updates
2015-06-02 12:36:38 +01:00
Henry Oswald
19f1a9ad82 changed style of async jobs to map to use underscore which is like we
use in the rest of the stack. Also removed a few => binds which are
not needed
2015-06-02 10:59:35 +01:00