Commit graph

21451 commits

Author SHA1 Message Date
Henry Oswald
69734c20c0 added heapdump endpoint 2015-11-30 16:16:16 +00:00
James Allen
92d18d7e2e Reduce limit to actuall 1Mb, not 1Gb 2015-11-30 15:40:03 +00:00
James Allen
0372fa3203 Add in extra logging about size of messages 2015-11-30 15:25:09 +00:00
Brian Gough
4bf90afe0e update tests 2015-11-30 15:22:21 +00:00
Brian Gough
7a9577e081 only flush to track-changes when ops are queued 2015-11-30 15:17:11 +00:00
Henry Oswald
4fa38178be ignore some common errors in sentry 2015-11-30 13:49:46 +00:00
Marc Egea i Sala
866f7dedee Fix error log folder
Error log is stored under /var/log/err.log. This PR fixes it and stores the log under /var/log/wlgb/err.log
2015-11-30 11:06:00 +00:00
Marc Egea i Sala
dfb4835cc1 Merge pull request #6 from overleaf/version-update
Update local version after processing snapshots
2015-11-30 11:00:41 +00:00
Brian Gough
529a061567 Merge pull request #4 from sharelatex/flush-ops-from-redis
push ops to track changes when document is flushed
2015-11-30 10:46:21 +00:00
Brian Gough
11be8c3733 increase timeout in lock manager test
on heavily loaded machines 20ms isn't long enough to consistently get
multiple calls to the lock manager
2015-11-27 14:25:25 +00:00
Brian Gough
3842f0d1cc Merge pull request #9 from sharelatex/only-delete-applied-ops
Only delete applied ops
2015-11-27 12:45:51 +00:00
Brian Gough
dedb02596f Merge pull request #10 from sharelatex/update-in-place
modify last compressed op in place
2015-11-27 12:45:43 +00:00
Brian Gough
8ebc069ddb modify last compressed op in place 2015-11-26 16:17:18 +00:00
Brian Gough
3432d9e91a added comments for redis delete 2015-11-26 15:16:54 +00:00
James Allen
8ddfbb99de Only parse body when we need to for copyFile request 2015-11-25 17:01:19 +00:00
James Allen
bc6c8d6afc Don't send multiple status codes on insertFile error 2015-11-25 16:07:51 +00:00
Brian Gough
e65549099c only delete the applied ops from redis 2015-11-25 16:01:07 +00:00
Henry Oswald
d6b3262ac7 Merge pull request #19 from EDP-Sciences/master
Add a PersistorManager library using the aws-sdk library
2015-11-25 14:50:38 +00:00
Xavier Trochu
81a7203315 Fix the checkIfFileExists API. 2015-11-25 15:40:35 +01:00
Henry Oswald
5213be4fe9 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-25 11:54:40 +00:00
Henry Oswald
91a84cb232 increase compile throttle limit 2015-11-25 11:07:53 +00:00
Henry Oswald
1ddf95e746 accesabble != accessible 2015-11-24 16:53:44 +00:00
Henry Oswald
8ca962b734 added missing convert handler 2015-11-24 14:17:40 +00:00
Marc Egea i Sala
0390f80aaa Merge pull request #5 from overleaf/file-not-in-the-current-commit
Try to download file if it's not in the git tree
2015-11-24 13:22:46 +00:00
John Lees-Miller
318e11deeb mock the persistent store with jmock 2015-11-24 12:06:43 +00:00
John Lees-Miller
e2574ab163 fix whitespace 2015-11-24 12:06:05 +00:00
John Lees-Miller
62749a0dab update to IDEA 15 2015-11-24 12:05:54 +00:00
John Lees-Miller
624c3e6af1 update to junit 4.12 to get jmock working
Also moved junit to the test scope.
2015-11-24 12:05:24 +00:00
Henry Oswald
4f3b01ed43 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-23 17:11:06 +00:00
Henry Oswald
89b2cd8477 added secure banner to both payment forms 2015-11-23 17:10:53 +00:00
Marc Egea i Sala
937d9c82b4 Update local version after processing snapshots 2015-11-23 16:24:22 +00:00
Henry Oswald
61182451f1 removed SubscriptionDomainHandler from user controller 2015-11-23 15:12:30 +00:00
Henry Oswald
333c1be68f added dropbox and github promo on left hand side 2015-11-23 15:12:17 +00:00
Marc Egea i Sala
6a25132f0c InteliJ IDEA project library files 2015-11-23 12:30:46 +00:00
Marc Egea i Sala
229ed1c09d Try to download file if it's not in the git tree 2015-11-23 09:36:24 +00:00
Xavier Trochu
3b6270236c Replace indentation from 2 space to tabs. 2015-11-20 14:38:23 +01:00
Xavier Trochu
b6486cb825 Cleanup the dependencies 2015-11-20 14:05:54 +01:00
Xavier Trochu
0219900933 Forward the options argument to getFileStream 2015-11-20 12:07:04 +01:00
Xavier Trochu
bfd41fdaf9 Add aws-sdk unit test.
Fix Aws-Sdk persistor to return a correct error on file not found.
Fix FileHandler after some change were lost on a previous merge
2015-11-20 12:02:22 +01:00
Henry Oswald
0e20cb36fd Merge pull request #2 from EDP-Sciences/master
Remove the internal metrics module.
2015-11-19 16:32:14 +00:00
Xavier Trochu
0323787a64 Remove the internal metrics module.
The internal metrics module is unneeded as metrics-sharelatex does the
same function.
2015-11-19 17:00:12 +01:00
James Allen
dea97bb9dc Fix bad connection debugging parameters 2015-11-19 13:15:51 +00:00
James Allen
442ae638de Revert "Report unsaved changes after 60 seconds"
This reverts commit 44a7e598f2fdbd91d18cc340de477ca3d33a1338.
2015-11-19 12:04:35 +00:00
James Allen
99bca31766 Error and hard refresh document after 30 seconds unsaved changes 2015-11-19 12:04:12 +00:00
James Allen
bf452bf306 Keep the connection.id up to date with socket.io client id
The meta.source of an update is populated on the server side so
we need to keep our local connection id up to date with it. When a duplicate
op is submitted we must send all possible client ids that it could have
been sent with.
2015-11-19 12:04:12 +00:00
James Allen
cde5144c42 Retry updates that have not been acknowledged.
If we do not get a reply from the server acknowledging our update after 5 seconds,
send it again. If it never got to the server, this is like normal. If the update
got to the server, but we never received the ack then we need to rely on ShareJs's
duplicate handling. We set the dupIfSource parameter on any retried updates which
let ShareJs know that it's a dup if we already have an op with this version number
and client id. The doc-updater and real-time services need changes to correctly
send another ack only to the submitting client in the case of a duplicate update.
2015-11-19 12:04:12 +00:00
Henry Oswald
6eb9b095bd Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-19 11:52:19 +00:00
Henry Oswald
dc066dfbdb added adminDN and adminPW fields to ldap settings 2015-11-19 11:52:11 +00:00
Henry Oswald
b3bdbb3fb7 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-19 11:51:53 +00:00
James Allen
503b766dcc For duplicate ops only send ack to submitting client
When a duplicate op is received, we only need to ack it to client
that sent it. Only that client is having trouble, and all other clients
will already have received it.
2015-11-19 10:58:28 +00:00