Commit graph

20315 commits

Author SHA1 Message Date
Henry Oswald
e1b3f3542c added some logging 2014-05-15 18:14:05 +01:00
Henry Oswald
24c50189b6 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-05-15 18:01:49 +01:00
Henry Oswald
f7245f32d0 cleaned up old password reset cruft 2014-05-15 18:01:43 +01:00
Henry Oswald
96d98329f1 token based reset works 2014-05-15 17:58:25 +01:00
James Allen
e6d5800f1b Start putting together .deb package builder 2014-05-15 17:45:24 +01:00
Henry Oswald
1ffd19099b writen getUserIdFromToken 2014-05-15 17:20:42 +01:00
Henry Oswald
9f901fb1ba added the token generator and its getNewToken function 2014-05-15 17:16:20 +01:00
Henry Oswald
64688e661d written password reset controller 2014-05-15 16:50:38 +01:00
James Allen
e72dd50089 Use configurable uploads folder location 2014-05-15 16:32:17 +01:00
James Allen
946f451155 Move to default settings file 2014-05-15 16:22:06 +01:00
Henry Oswald
551e1d465a written password reset handler 2014-05-15 16:20:23 +01:00
James Allen
93883c7a03 Fix calling of updateDoc 2014-05-15 15:43:04 +01:00
James Allen
f6e85c4140 Don't proxy version number to/from docstore 2014-05-15 12:44:08 +01:00
James Allen
ffd10a8439 Don't send or get versioning info to/from web
The version number is only used by the doc updater and so can be cleanly
encapsulated in a collection that only the doc updater knows about. The version
is already stored under docOps, so continue to tore it there.
2014-05-15 11:13:16 +01:00
James Allen
e25fb7e435 Keeping writing and reading updates from Mongo to cover the deploy period 2014-05-14 16:04:25 +01:00
James Allen
bf8fae176f Merge pull request #72 from anka-213/master
Fixes #63, highlighting file names when renaming up to full stop
2014-05-14 15:50:13 +01:00
Andreas Källberg
db89f8c8db Fixes #63, highlighting file names when renaming up to full stop 2014-05-14 16:40:51 +02:00
James Allen
bdfe018cad Log out warning when using Mongo for version still 2014-05-14 14:16:27 +01:00
James Allen
0199f2e129 Use version from web, with fallback to old mongo collection 2014-05-14 13:28:17 +01:00
James Allen
8973969224 Merge branch 'master' into remove_mongo_doc_ops
Conflicts:
	app/coffee/DocOpsManager.coffee
	test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee
	test/acceptance/coffee/FlushingDocsTests.coffee
	test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee
	test/unit/coffee/RedisManager/prependDocOpsTests.coffee
	test/unit/coffee/RedisManager/pushDocOpTests.coffee
2014-05-14 12:39:40 +01:00
Henry Oswald
c8fae26995 changed type to query_type as it conflicts with logstash 2014-05-13 15:24:23 +01:00
James Allen
79457227e1 Support up to 2mb requests 2014-05-13 12:54:58 +01:00
Henry Oswald
1f1f535c8b removed lines which may be causing issue with domain 2014-05-12 18:33:09 +01:00
Henry Oswald
ce67c8c655 added logging to err domain 2014-05-12 15:57:08 +01:00
Henry Oswald
3bbeff5aff moved all metrics to use the module, deleting old metrics file and added different check in err domain 2014-05-12 15:45:15 +01:00
James Allen
1dea55d8f2 Check that req.route.path is set 2014-05-12 15:28:09 +01:00
James Allen
4a27342b01 Merge branch 'docstore_integration' 2014-05-12 14:23:41 +01:00
James Allen
3213c562bc Add in new metrics 2014-05-09 14:55:37 +01:00
James Allen
284d8fb588 Namespace gauge keys correctly 2014-05-09 13:54:33 +01:00
James Allen
76f929f415 Add in new http monitoring 2014-05-09 13:30:35 +01:00
James Allen
00c0036ca5 Add open socket monitoring 2014-05-09 13:30:12 +01:00
James Allen
c835528dea Add in metrics 2014-05-09 12:44:13 +01:00
James Allen
0bddc5552e Use docstore for updating documents 2014-05-08 15:47:50 +01:00
James Allen
0dda75c2d5 Pass through version and revision information 2014-05-08 15:43:08 +01:00
James Allen
8315de58c7 Proxy get doc requests to the docstore 2014-05-08 13:42:30 +01:00
Henry Oswald
9a81f85b41 added gauge metrics for number of open socket.io http and https
connections
2014-05-08 11:33:46 +01:00
Henry Oswald
a8571653db added timeouts to filestore handler 2014-05-08 10:55:44 +01:00
James Allen
6011ce4783 Use new metrics module 2014-05-08 09:28:13 +01:00
James Allen
0adcf3c140 Log out errors when null docs are encountered 2014-05-07 16:38:10 +01:00
James Allen
43ed71e82c Do a check for null docs 2014-05-07 16:24:47 +01:00
James Allen
b29e94b4d5 Use new metrics package 2014-05-07 15:29:04 +01:00
James Allen
c73b7fae69 Use docstore when creating a new doc 2014-05-07 14:31:46 +01:00
James Allen
86f220a2d2 Add collection into graphite key 2014-05-07 11:50:09 +01:00
James Allen
45ec60d8a6 Fix broken key building in timer 2014-05-07 11:43:46 +01:00
James Allen
873297b02e Namespace http request keys 2014-05-07 11:13:21 +01:00
James Allen
befb48a20f Use correct key in Metrics.timing 2014-05-07 11:08:46 +01:00
James Allen
ccbe33a82e Add in http monitoring 2014-05-07 10:59:16 +01:00
James Allen
f4895fb04f Add in http monitoring 2014-05-07 10:58:52 +01:00
James Allen
f511ebd4b6 Exit cleanly on SIGINT et al 2014-05-07 10:05:07 +01:00
James Allen
d1434f7646 Increase redis lock expiry time to 30 seconds 2014-05-07 09:48:29 +01:00