From 0b4ae6ef8d707a0a931756d3f048faa6859c7bd4 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 11 Dec 2018 12:11:53 +0000 Subject: [PATCH 1/7] Use metrics which labels host in timing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e565b38..f0589b8 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lockfile": "^1.0.3", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.4", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.4", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#d96892cc1741dd6d59e83c924a1458e4929d39b7", "mkdirp": "0.3.5", "mysql": "2.6.2", "request": "^2.21.0", From 71181243b37279433344f48108bb489468cbc7e4 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 13 Dec 2018 14:15:19 +0000 Subject: [PATCH 2/7] Bump metrics-sharelatex.git to v2.0.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0589b8..84a3153 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lockfile": "^1.0.3", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.4", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#d96892cc1741dd6d59e83c924a1458e4929d39b7", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.11", "mkdirp": "0.3.5", "mysql": "2.6.2", "request": "^2.21.0", From 8401bbdc26f062a8764632c1478189f623adad8c Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 13 Dec 2018 14:21:32 +0000 Subject: [PATCH 3/7] Bump metrics-sharelatex to v2.0.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 84a3153..49f5873 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lockfile": "^1.0.3", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.4", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.11", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12", "mkdirp": "0.3.5", "mysql": "2.6.2", "request": "^2.21.0", From 855f26c5205039e96cfea8d224eff5ebb743e046 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 13 Dec 2018 14:24:44 +0000 Subject: [PATCH 4/7] Initialise metrics at begining of app --- app.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app.coffee b/app.coffee index 10bceee..d9faf9e 100644 --- a/app.coffee +++ b/app.coffee @@ -1,3 +1,8 @@ +Metrics = require "metrics-sharelatex" +Metrics.initialize("clsi") +Metrics.open_sockets.monitor(logger) +Metrics.memory.monitor(logger) + CompileController = require "./app/js/CompileController" Settings = require "settings-sharelatex" logger = require "logger-sharelatex" @@ -12,11 +17,6 @@ Errors = require './app/js/Errors' Path = require "path" fs = require "fs" -Metrics = require "metrics-sharelatex" -Metrics.initialize("clsi") -Metrics.open_sockets.monitor(logger) -Metrics.memory.monitor(logger) - ProjectPersistenceManager = require "./app/js/ProjectPersistenceManager" OutputCacheManager = require "./app/js/OutputCacheManager" From 38874f9169abfb1bcc7297988abe22c012a4c107 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 13 Dec 2018 14:45:40 +0000 Subject: [PATCH 5/7] Bump buildscript to 1.1.10 --- .github/ISSUE_TEMPLATE.md | 38 +++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 45 ++++++++++++++++++++++++++++++++ Dockerfile | 2 +- Makefile | 2 +- buildscript.txt | 9 +++++++ docker-compose.ci.yml | 2 +- docker-compose.yml | 2 +- package.json | 2 +- 8 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 buildscript.txt diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..e0093aa --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,38 @@ + + +## Steps to Reproduce + + + +1. +2. +3. + +## Expected Behaviour + + +## Observed Behaviour + + + +## Context + + +## Technical Info + + +* URL: +* Browser Name and version: +* Operating System and version (desktop or mobile): +* Signed in as: +* Project and/or file: + +## Analysis + + +## Who Needs to Know? + + + +- +- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ed25ee8 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,45 @@ + + +### Description + + + +#### Screenshots + + + +#### Related Issues / PRs + + + +### Review + + + +#### Potential Impact + + + +#### Manual Testing Performed + +- [ ] +- [ ] + +#### Accessibility + + + +### Deployment + + + +#### Deployment Checklist + +- [ ] Update documentation not included in the PR (if any) +- [ ] + +#### Metrics and Monitoring + + + +#### Who Needs to Know? diff --git a/Dockerfile b/Dockerfile index 1ccc689..53f4b94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,4 @@ WORKDIR /app RUN chmod 0755 ./install_deps.sh && ./install_deps.sh ENTRYPOINT ["/bin/sh", "entrypoint.sh"] -CMD ["node","app.js"] +CMD ["node", "--expose-gc", "app.js"] diff --git a/Makefile b/Makefile index b1ce293..7558b6e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.9 +# Version: 1.1.10 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) diff --git a/buildscript.txt b/buildscript.txt new file mode 100644 index 0000000..e4a8e46 --- /dev/null +++ b/buildscript.txt @@ -0,0 +1,9 @@ +--script-version=1.1.10 +clsi +--node-version=6.14.1 +--acceptance-creds=None +--language=coffeescript +--dependencies=mongo,redis +--docker-repos=gcr.io/overleaf-ops +--kube=false +--build-target=docker diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index f6c8a27..57108f5 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.9 +# Version: 1.1.10 version: "2" diff --git a/docker-compose.yml b/docker-compose.yml index 371e6e7..61bb842 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.9 +# Version: 1.1.10 version: "2" diff --git a/package.json b/package.json index 49f5873..0bc083c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/sharelatex/clsi-sharelatex.git" }, "scripts": { - "compile:app": "([ -e app/coffee ] && coffee $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", + "compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 30000 --exit $@ test/acceptance/js", "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP", From 19078fe866034aa259af21ff54e73c56fa193c9a Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 13 Dec 2018 17:33:45 +0000 Subject: [PATCH 6/7] Revert "Initialise metrics at begining of app" This reverts commit 855f26c5205039e96cfea8d224eff5ebb743e046. --- app.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app.coffee b/app.coffee index d9faf9e..10bceee 100644 --- a/app.coffee +++ b/app.coffee @@ -1,8 +1,3 @@ -Metrics = require "metrics-sharelatex" -Metrics.initialize("clsi") -Metrics.open_sockets.monitor(logger) -Metrics.memory.monitor(logger) - CompileController = require "./app/js/CompileController" Settings = require "settings-sharelatex" logger = require "logger-sharelatex" @@ -17,6 +12,11 @@ Errors = require './app/js/Errors' Path = require "path" fs = require "fs" +Metrics = require "metrics-sharelatex" +Metrics.initialize("clsi") +Metrics.open_sockets.monitor(logger) +Metrics.memory.monitor(logger) + ProjectPersistenceManager = require "./app/js/ProjectPersistenceManager" OutputCacheManager = require "./app/js/OutputCacheManager" From 9507f0f80faf1ed1c8c03fd96ee17c88e81cc5ad Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 13 Dec 2018 17:37:16 +0000 Subject: [PATCH 7/7] Revert "Bump buildscript to 1.1.10" This reverts commit 38874f9169abfb1bcc7297988abe22c012a4c107. --- .github/ISSUE_TEMPLATE.md | 38 --------------------------- .github/PULL_REQUEST_TEMPLATE.md | 45 -------------------------------- Dockerfile | 2 +- Makefile | 2 +- buildscript.txt | 9 ------- docker-compose.ci.yml | 2 +- docker-compose.yml | 2 +- package.json | 2 +- 8 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 buildscript.txt diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index e0093aa..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,38 +0,0 @@ - - -## Steps to Reproduce - - - -1. -2. -3. - -## Expected Behaviour - - -## Observed Behaviour - - - -## Context - - -## Technical Info - - -* URL: -* Browser Name and version: -* Operating System and version (desktop or mobile): -* Signed in as: -* Project and/or file: - -## Analysis - - -## Who Needs to Know? - - - -- -- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index ed25ee8..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,45 +0,0 @@ - - -### Description - - - -#### Screenshots - - - -#### Related Issues / PRs - - - -### Review - - - -#### Potential Impact - - - -#### Manual Testing Performed - -- [ ] -- [ ] - -#### Accessibility - - - -### Deployment - - - -#### Deployment Checklist - -- [ ] Update documentation not included in the PR (if any) -- [ ] - -#### Metrics and Monitoring - - - -#### Who Needs to Know? diff --git a/Dockerfile b/Dockerfile index 53f4b94..1ccc689 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,4 @@ WORKDIR /app RUN chmod 0755 ./install_deps.sh && ./install_deps.sh ENTRYPOINT ["/bin/sh", "entrypoint.sh"] -CMD ["node", "--expose-gc", "app.js"] +CMD ["node","app.js"] diff --git a/Makefile b/Makefile index 7558b6e..b1ce293 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.10 +# Version: 1.1.9 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) diff --git a/buildscript.txt b/buildscript.txt deleted file mode 100644 index e4a8e46..0000000 --- a/buildscript.txt +++ /dev/null @@ -1,9 +0,0 @@ ---script-version=1.1.10 -clsi ---node-version=6.14.1 ---acceptance-creds=None ---language=coffeescript ---dependencies=mongo,redis ---docker-repos=gcr.io/overleaf-ops ---kube=false ---build-target=docker diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 57108f5..f6c8a27 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.10 +# Version: 1.1.9 version: "2" diff --git a/docker-compose.yml b/docker-compose.yml index 61bb842..371e6e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.10 +# Version: 1.1.9 version: "2" diff --git a/package.json b/package.json index 0bc083c..49f5873 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/sharelatex/clsi-sharelatex.git" }, "scripts": { - "compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", + "compile:app": "([ -e app/coffee ] && coffee $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 30000 --exit $@ test/acceptance/js", "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP",