update logger and metrics

This commit is contained in:
Shane Kilkelly 2019-06-21 10:06:02 +01:00
parent 81fcddf7e9
commit 429c593cdf
6 changed files with 233 additions and 179 deletions

View file

@ -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.12
# Version: 1.1.21
BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@ -26,7 +26,9 @@ test: test_unit test_acceptance
test_unit:
@[ ! -d test/unit ] && echo "notifications has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit
test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run
test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run
test_acceptance_run:
@[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
test_clean:

View file

@ -5,4 +5,4 @@ notifications
--dependencies=mongo,redis
--docker-repos=gcr.io/overleaf-ops
--build-target=docker
--script-version=1.1.12
--script-version=1.1.21

View file

@ -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.12
# Version: 1.1.21
version: "2"
@ -10,6 +10,8 @@ services:
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
user: node
command: npm run test:unit:_run
environment:
NODE_ENV: test
test_acceptance:
@ -21,6 +23,7 @@ services:
MONGO_HOST: mongo
POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
depends_on:
- mongo
- redis

View file

@ -1,18 +1,19 @@
# 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.12
# Version: 1.1.21
version: "2"
services:
test_unit:
build: .
image: node:6.14.1
volumes:
- .:/app
working_dir: /app
environment:
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
command: npm run test:unit
user: node
@ -27,6 +28,8 @@ services:
MONGO_HOST: mongo
POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
user: node
depends_on:
- mongo
@ -49,3 +52,4 @@ services:
mongo:
image: mongo:3.4

View file

@ -3,19 +3,19 @@
"version": "0.0.1",
"dependencies": {
"@google-cloud/common": {
"version": "0.27.0",
"from": "@google-cloud/common@>=0.27.0 <0.28.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.27.0.tgz"
"version": "0.32.1",
"from": "@google-cloud/common@>=0.32.0 <0.33.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.32.1.tgz"
},
"@google-cloud/debug-agent": {
"version": "3.0.1",
"version": "3.2.0",
"from": "@google-cloud/debug-agent@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-3.0.1.tgz",
"resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-3.2.0.tgz",
"dependencies": {
"coffeescript": {
"version": "2.3.2",
"version": "2.4.1",
"from": "coffeescript@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.3.2.tgz"
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.4.1.tgz"
}
}
},
@ -29,34 +29,59 @@
"from": "@google-cloud/common@>=0.26.0 <0.27.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.26.2.tgz"
},
"@google-cloud/promisify": {
"version": "0.3.1",
"from": "@google-cloud/promisify@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
},
"arrify": {
"version": "1.0.1",
"from": "arrify@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
},
"gcp-metadata": {
"version": "0.9.3",
"from": "gcp-metadata@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.3.tgz"
},
"google-auth-library": {
"version": "2.0.2",
"from": "google-auth-library@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-2.0.2.tgz",
"dependencies": {
"gcp-metadata": {
"version": "0.7.0",
"from": "gcp-metadata@>=0.7.0 <0.8.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
}
}
},
"semver": {
"version": "5.7.0",
"from": "semver@>=5.5.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"
},
"through2": {
"version": "3.0.0",
"version": "3.0.1",
"from": "through2@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz"
"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"
}
}
},
"@google-cloud/projectify": {
"version": "0.3.2",
"from": "@google-cloud/projectify@>=0.3.2 <0.4.0",
"resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.2.tgz"
"version": "0.3.3",
"from": "@google-cloud/projectify@>=0.3.3 <0.4.0",
"resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.3.tgz"
},
"@google-cloud/promisify": {
"version": "0.3.1",
"from": "@google-cloud/promisify@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
"version": "0.4.0",
"from": "@google-cloud/promisify@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.4.0.tgz"
},
"@google-cloud/trace-agent": {
"version": "3.5.0",
"version": "3.6.1",
"from": "@google-cloud/trace-agent@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.0.tgz",
"dependencies": {
"@google-cloud/common": {
"version": "0.28.0",
"from": "@google-cloud/common@>=0.28.0 <0.29.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.28.0.tgz"
}
}
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.6.1.tgz"
},
"@protobufjs/aspromise": {
"version": "1.1.2",
@ -109,9 +134,9 @@
"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"
},
"@sindresorhus/is": {
"version": "0.13.0",
"from": "@sindresorhus/is@>=0.13.0 <0.14.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.13.0.tgz"
"version": "0.15.0",
"from": "@sindresorhus/is@>=0.15.0 <0.16.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.15.0.tgz"
},
"@sinonjs/commons": {
"version": "1.3.0",
@ -132,9 +157,9 @@
"dev": true
},
"@types/caseless": {
"version": "0.12.1",
"version": "0.12.2",
"from": "@types/caseless@*",
"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"
"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"
},
"@types/console-log-level": {
"version": "1.4.0",
@ -157,9 +182,9 @@
"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz"
},
"@types/node": {
"version": "10.12.18",
"version": "12.0.8",
"from": "@types/node@*",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz"
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.8.tgz"
},
"@types/request": {
"version": "2.48.1",
@ -172,29 +197,34 @@
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz"
},
"@types/tough-cookie": {
"version": "2.3.4",
"version": "2.3.5",
"from": "@types/tough-cookie@*",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.4.tgz"
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz"
},
"abort-controller": {
"version": "3.0.0",
"from": "abort-controller@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"
},
"acorn": {
"version": "5.7.3",
"from": "acorn@>=5.0.3 <6.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"
"version": "6.1.1",
"from": "acorn@>=6.0.0 <7.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"
},
"agent-base": {
"version": "4.2.1",
"version": "4.3.0",
"from": "agent-base@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"
},
"ajv": {
"version": "6.7.0",
"version": "6.10.0",
"from": "ajv@>=6.5.5 <7.0.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"
},
"arrify": {
"version": "1.0.1",
"from": "arrify@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
"version": "2.0.1",
"from": "arrify@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
},
"asn1": {
"version": "0.2.4",
@ -220,7 +250,14 @@
"async-listener": {
"version": "0.6.10",
"from": "async-listener@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz"
"resolved": "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz",
"dependencies": {
"semver": {
"version": "5.7.0",
"from": "semver@>=5.3.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"
}
}
},
"asynckit": {
"version": "0.4.0",
@ -238,15 +275,20 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"
},
"axios": {
"version": "0.18.0",
"version": "0.18.1",
"from": "axios@>=0.18.0 <0.19.0",
"resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz"
"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"
},
"balanced-match": {
"version": "1.0.0",
"from": "balanced-match@https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
},
"base64-js": {
"version": "1.3.0",
"from": "base64-js@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"
},
"bcrypt-pbkdf": {
"version": "1.0.2",
"from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
@ -258,9 +300,9 @@
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"
},
"bindings": {
"version": "1.3.1",
"version": "1.5.0",
"from": "bindings@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz"
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
},
"bintrees": {
"version": "1.0.1",
@ -284,15 +326,14 @@
"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
},
"builtin-modules": {
"version": "3.0.0",
"version": "3.1.0",
"from": "builtin-modules@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz"
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"
},
"bunyan": {
"version": "1.8.12",
"from": "bunyan@https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"
},
"caseless": {
"version": "0.12.0",
@ -324,9 +365,9 @@
}
},
"combined-stream": {
"version": "1.0.7",
"version": "1.0.8",
"from": "combined-stream@>=1.0.6 <1.1.0",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
},
"commander": {
"version": "2.11.0",
@ -340,9 +381,9 @@
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
},
"console-log-level": {
"version": "1.4.0",
"version": "1.4.1",
"from": "console-log-level@>=1.4.0 <2.0.0",
"resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.0.tgz"
"resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.1.tgz"
},
"continuation-local-storage": {
"version": "3.2.1",
@ -376,9 +417,9 @@
"dev": true
},
"delay": {
"version": "4.1.0",
"version": "4.3.0",
"from": "delay@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/delay/-/delay-4.1.0.tgz"
"resolved": "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz"
},
"delayed-stream": {
"version": "1.0.0",
@ -395,13 +436,12 @@
"version": "0.8.7",
"from": "dtrace-provider@https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz",
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz",
"dev": true,
"optional": true
},
"duplexify": {
"version": "3.6.1",
"version": "3.7.1",
"from": "duplexify@>=3.6.0 <4.0.0",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz"
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
},
"ecc-jsbn": {
"version": "0.1.2",
@ -409,9 +449,9 @@
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
},
"ecdsa-sig-formatter": {
"version": "1.0.10",
"from": "ecdsa-sig-formatter@1.0.10",
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"
"version": "1.0.11",
"from": "ecdsa-sig-formatter@1.0.11",
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
},
"emitter-listener": {
"version": "1.1.2",
@ -429,9 +469,9 @@
"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
},
"es6-promise": {
"version": "4.2.5",
"version": "4.2.8",
"from": "es6-promise@>=4.0.3 <5.0.0",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz"
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"
},
"es6-promisify": {
"version": "5.0.0",
@ -444,6 +484,11 @@
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"dev": true
},
"event-target-shim": {
"version": "5.0.1",
"from": "event-target-shim@>=5.0.0 <6.0.0",
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"
},
"express": {
"version": "3.1.0",
"from": "express@https://registry.npmjs.org/express/-/express-3.1.0.tgz",
@ -562,15 +607,25 @@
"from": "fast-json-stable-stringify@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"
},
"fast-text-encoding": {
"version": "1.0.0",
"from": "fast-text-encoding@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz"
},
"file-uri-to-path": {
"version": "1.0.0",
"from": "file-uri-to-path@1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
},
"findit2": {
"version": "2.2.3",
"from": "findit2@>=2.2.3 <3.0.0",
"resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz"
},
"follow-redirects": {
"version": "1.6.1",
"from": "follow-redirects@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz"
"version": "1.5.10",
"from": "follow-redirects@1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"
},
"forever-agent": {
"version": "0.6.1",
@ -589,14 +644,14 @@
"dev": true
},
"gaxios": {
"version": "1.0.7",
"from": "gaxios@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.0.7.tgz"
"version": "1.8.4",
"from": "gaxios@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.8.4.tgz"
},
"gcp-metadata": {
"version": "0.9.3",
"from": "gcp-metadata@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.3.tgz"
"version": "1.0.0",
"from": "gcp-metadata@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-1.0.0.tgz"
},
"get-func-name": {
"version": "2.0.0",
@ -616,21 +671,21 @@
"optional": true
},
"google-auth-library": {
"version": "2.0.2",
"from": "google-auth-library@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-2.0.2.tgz",
"version": "3.1.2",
"from": "google-auth-library@>=3.1.1 <4.0.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz",
"dependencies": {
"gcp-metadata": {
"version": "0.7.0",
"from": "gcp-metadata@>=0.7.0 <0.8.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
"semver": {
"version": "5.7.0",
"from": "semver@>=5.5.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"
}
}
},
"google-p12-pem": {
"version": "1.0.3",
"version": "1.0.4",
"from": "google-p12-pem@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.3.tgz"
"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.4.tgz"
},
"growl": {
"version": "1.10.3",
@ -639,16 +694,9 @@
"dev": true
},
"gtoken": {
"version": "2.3.0",
"from": "gtoken@>=2.3.0 <3.0.0",
"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz",
"dependencies": {
"pify": {
"version": "3.0.0",
"from": "pify@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
}
}
"version": "2.3.3",
"from": "gtoken@>=2.3.2 <3.0.0",
"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.3.tgz"
},
"har-schema": {
"version": "2.0.0",
@ -673,9 +721,9 @@
"dev": true
},
"hex2dec": {
"version": "1.1.1",
"version": "1.1.2",
"from": "hex2dec@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.1.tgz"
"resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.2.tgz"
},
"http-signature": {
"version": "1.2.0",
@ -703,9 +751,9 @@
"resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz"
},
"is-buffer": {
"version": "1.1.6",
"from": "is-buffer@>=1.1.5 <2.0.0",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
"version": "2.0.3",
"from": "is-buffer@>=2.0.2 <3.0.0",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"
},
"is-typedarray": {
"version": "1.0.0",
@ -760,14 +808,14 @@
"dev": true
},
"jwa": {
"version": "1.1.6",
"from": "jwa@>=1.1.5 <2.0.0",
"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz"
"version": "1.4.1",
"from": "jwa@>=1.4.1 <2.0.0",
"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"
},
"jws": {
"version": "3.1.5",
"version": "3.2.2",
"from": "jws@>=3.1.5 <4.0.0",
"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz"
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"
},
"lodash.get": {
"version": "4.4.2",
@ -781,26 +829,10 @@
"resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"
},
"logger-sharelatex": {
"version": "1.6.0",
"from": "logger-sharelatex@>=1.6.0 <2.0.0",
"resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.6.0.tgz",
"version": "1.7.0",
"from": "logger-sharelatex@1.7.0",
"resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.7.0.tgz",
"dependencies": {
"bunyan": {
"version": "1.5.1",
"from": "bunyan@1.5.1",
"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"
},
"coffee-script": {
"version": "1.12.4",
"from": "coffee-script@1.12.4",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"
},
"dtrace-provider": {
"version": "0.6.0",
"from": "dtrace-provider@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz",
"optional": true
},
"request": {
"version": "2.88.0",
"from": "request@>=2.88.0 <3.0.0",
@ -845,9 +877,9 @@
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
},
"metrics-sharelatex": {
"version": "2.1.1",
"from": "metrics-sharelatex@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/metrics-sharelatex/-/metrics-sharelatex-2.1.1.tgz",
"version": "2.2.0",
"from": "metrics-sharelatex@2.2.0",
"resolved": "https://registry.npmjs.org/metrics-sharelatex/-/metrics-sharelatex-2.2.0.tgz",
"dependencies": {
"coffee-script": {
"version": "1.6.0",
@ -862,19 +894,19 @@
}
},
"mime": {
"version": "2.4.0",
"version": "2.4.4",
"from": "mime@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz"
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"
},
"mime-db": {
"version": "1.37.0",
"from": "mime-db@>=1.37.0 <1.38.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz"
"version": "1.40.0",
"from": "mime-db@1.40.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"
},
"mime-types": {
"version": "2.1.21",
"version": "2.1.24",
"from": "mime-types@>=2.1.19 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"
},
"minimatch": {
"version": "3.0.4",
@ -914,7 +946,6 @@
"version": "2.22.2",
"from": "moment@https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
"dev": true,
"optional": true
},
"mongojs": {
@ -1115,14 +1146,14 @@
"dev": true
},
"node-fetch": {
"version": "2.3.0",
"from": "node-fetch@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz"
"version": "2.6.0",
"from": "node-fetch@>=2.3.0 <3.0.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"
},
"node-forge": {
"version": "0.7.6",
"from": "node-forge@>=0.7.5 <0.8.0",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"
"version": "0.8.4",
"from": "node-forge@>=0.8.0 <0.9.0",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.4.tgz"
},
"node-statsd": {
"version": "0.0.3",
@ -1147,14 +1178,14 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
},
"p-limit": {
"version": "2.1.0",
"from": "p-limit@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz"
"version": "2.2.0",
"from": "p-limit@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"
},
"p-try": {
"version": "2.0.0",
"version": "2.2.0",
"from": "p-try@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz"
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
},
"parse-duration": {
"version": "0.1.1",
@ -1162,9 +1193,9 @@
"resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.1.1.tgz"
},
"parse-ms": {
"version": "2.0.0",
"version": "2.1.0",
"from": "parse-ms@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.0.0.tgz"
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz"
},
"path-is-absolute": {
"version": "1.0.1",
@ -1209,19 +1240,26 @@
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"
},
"prom-client": {
"version": "11.2.1",
"version": "11.5.1",
"from": "prom-client@>=11.1.3 <12.0.0",
"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.1.tgz"
"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.5.1.tgz"
},
"protobufjs": {
"version": "6.8.8",
"from": "protobufjs@>=6.8.6 <6.9.0",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz"
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz",
"dependencies": {
"@types/node": {
"version": "10.14.9",
"from": "@types/node@>=10.1.0 <11.0.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.9.tgz"
}
}
},
"psl": {
"version": "1.1.31",
"version": "1.1.32",
"from": "psl@>=1.1.24 <2.0.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"
"resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"
},
"punycode": {
"version": "2.1.1",
@ -1234,9 +1272,9 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
},
"raven": {
"version": "1.2.1",
"from": "raven@>=1.1.3 <2.0.0",
"resolved": "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz",
"version": "1.1.3",
"from": "raven@1.1.3",
"resolved": "https://registry.npmjs.org/raven/-/raven-1.1.3.tgz",
"dependencies": {
"uuid": {
"version": "3.0.0",
@ -1547,9 +1585,21 @@
}
},
"require-in-the-middle": {
"version": "3.1.0",
"from": "require-in-the-middle@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-3.1.0.tgz"
"version": "4.0.0",
"from": "require-in-the-middle@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-4.0.0.tgz",
"dependencies": {
"debug": {
"version": "4.1.1",
"from": "debug@>=4.1.1 <5.0.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"
},
"ms": {
"version": "2.1.2",
"from": "ms@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
}
}
},
"require-like": {
"version": "0.1.2",
@ -1558,9 +1608,9 @@
"dev": true
},
"resolve": {
"version": "1.9.0",
"from": "resolve@>=1.5.0 <2.0.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"
"version": "1.11.0",
"from": "resolve@>=1.10.0 <2.0.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz"
},
"retry-axios": {
"version": "0.3.2",
@ -1601,9 +1651,9 @@
"dev": true
},
"semver": {
"version": "5.6.0",
"from": "semver@>=5.5.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"
"version": "6.1.1",
"from": "semver@>=6.0.0 <7.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"
},
"settings-sharelatex": {
"version": "1.1.0",
@ -1618,9 +1668,9 @@
}
},
"shimmer": {
"version": "1.2.0",
"version": "1.2.1",
"from": "shimmer@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.0.tgz"
"resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz"
},
"sinon": {
"version": "6.3.5",
@ -1689,11 +1739,6 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
"dev": true
},
"symbol-observable": {
"version": "1.2.0",
"from": "symbol-observable@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"
},
"tdigest": {
"version": "0.1.1",
"from": "tdigest@>=0.1.1 <0.2.0",

View file

@ -22,8 +22,8 @@
"async": "^0.1.22",
"coffee-script": "^1.7.1",
"express": "3.1.0",
"logger-sharelatex": "^1.6.0",
"metrics-sharelatex": "^2.1.1",
"logger-sharelatex": "^1.7.0",
"metrics-sharelatex": "^2.2.0",
"mongojs": "^2.4.0",
"node-statsd": "0.0.3",
"request": "^2.65.0",