From 9d97d1dc5382b724289f4ba14eb9623aaa7898d1 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 27 Nov 2014 11:08:29 +0000 Subject: [PATCH 1/3] Handle templates locally ok --- services/filestore/.gitignore | 1 + services/filestore/config/settings.defaults.coffee | 1 + services/filestore/template_files/.gitignore | 0 3 files changed, 2 insertions(+) create mode 100644 services/filestore/template_files/.gitignore diff --git a/services/filestore/.gitignore b/services/filestore/.gitignore index 723e09aef3..7d881c3ca7 100644 --- a/services/filestore/.gitignore +++ b/services/filestore/.gitignore @@ -56,6 +56,7 @@ test/unit/js/ test/acceptence/js user_files/* +template_files/* **.swp diff --git a/services/filestore/config/settings.defaults.coffee b/services/filestore/config/settings.defaults.coffee index a7c92528ac..dccefea525 100644 --- a/services/filestore/config/settings.defaults.coffee +++ b/services/filestore/config/settings.defaults.coffee @@ -21,6 +21,7 @@ module.exports = # Must contain full path, e.g. "/var/lib/sharelatex/data". # This path must exist, not be tmpfs and be writable to by the user sharelatex is run as. user_files: Path.resolve(__dirname + "/../user_files") + template_files: Path.resolve(__dirname + "/../template_files") # if you are using S3, then fill in your S3 details below # s3: # key: "" diff --git a/services/filestore/template_files/.gitignore b/services/filestore/template_files/.gitignore new file mode 100644 index 0000000000..e69de29bb2 From dee7799fd4df914ba908d110fe7bea1b4bc45800 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 27 Nov 2014 13:48:39 +0000 Subject: [PATCH 2/3] added heapdump and endpoint to make dump --- services/filestore/app.coffee | 4 ++++ services/filestore/package.json | 29 +++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/services/filestore/app.coffee b/services/filestore/app.coffee index 3c8fcde1c1..c899bf05a1 100644 --- a/services/filestore/app.coffee +++ b/services/filestore/app.coffee @@ -66,6 +66,10 @@ app.del "/project/:project_id/file/:file_id", keyBuilder.userFileKey, fileContro app.get "/template/:template_id/v/:version/:format", keyBuilder.templateFileKey, fileController.getFile app.post "/template/:template_id/v/:version/:format", keyBuilder.templateFileKey, fileController.insertFile +app.get "/heapdump", (req, res)-> + require('heapdump').writeSnapshot '/tmp/' + Date.now() + '.filestore.heapsnapshot', (err, filename)-> + res.send filename + app.post "/shutdown", (req, res)-> appIsOk = false res.send() diff --git a/services/filestore/package.json b/services/filestore/package.json index 5b97e24e40..cf95afd0a2 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -2,22 +2,23 @@ "name": "filestore-sharelatex", "version": "0.0.1", "dependencies": { - "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master", - "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master", - "request": "2.14.0", - "lynx": "0.0.11", - "grunt-mocha-test": "~0.8.2", - "knox": "~0.8.8", - "node-uuid": "~1.4.1", - "underscore": "~1.5.2", - "express": "~3.4.8", - "longjohn": "~0.2.2", "async": "~0.2.10", - "pngcrush": "0.0.3", - "stream-buffers": "~0.2.5", + "coffee-script": "~1.7.1", + "express": "~3.4.8", + "grunt-mocha-test": "~0.8.2", + "heapdump": "^0.3.2", + "knox": "~0.8.8", + "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", + "longjohn": "~0.2.2", + "lynx": "0.0.11", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master", "node-transloadit": "0.0.4", - "coffee-script": "~1.7.1" + "node-uuid": "~1.4.1", + "pngcrush": "0.0.3", + "request": "2.14.0", + "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master", + "stream-buffers": "~0.2.5", + "underscore": "~1.5.2" }, "devDependencies": { "sinon": "", From e90eb4b3fb0b986fc50b3dfedc98b284dafce24e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Sat, 29 Nov 2014 13:02:06 +0000 Subject: [PATCH 3/3] bump knox --- services/filestore/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/filestore/package.json b/services/filestore/package.json index 9dd42f7a99..be103715f7 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -12,7 +12,7 @@ "express": "~3.4.8", "grunt-mocha-test": "~0.8.2", "heapdump": "^0.3.2", - "knox": "~0.8.8", + "knox": "~0.9.1", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", "longjohn": "~0.2.2", "lynx": "0.0.11",