From 581963a4af43a543f9939cb95555f595f0a8b1cc Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 23 May 2018 13:52:20 +0100
Subject: [PATCH 01/28] Dockerised env. 1.1.3 build scripts

---
 services/document-updater/.dockerignore       | 60 +++----------------
 services/document-updater/Dockerfile          | 22 +++++++
 services/document-updater/Jenkinsfile         | 36 +----------
 services/document-updater/Makefile            | 25 ++++++--
 .../document-updater/docker-compose.ci.yml    | 23 ++++---
 services/document-updater/docker-compose.yml  | 22 ++++---
 services/document-updater/nodemon.json        |  5 +-
 services/document-updater/package.json        | 12 ++--
 8 files changed, 87 insertions(+), 118 deletions(-)
 create mode 100644 services/document-updater/Dockerfile

diff --git a/services/document-updater/.dockerignore b/services/document-updater/.dockerignore
index ad21f261b4..386f26df30 100644
--- a/services/document-updater/.dockerignore
+++ b/services/document-updater/.dockerignore
@@ -1,53 +1,9 @@
-compileFolder
-
-Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store?
-ehthumbs.db
-Icon?
-Thumbs.db
-
-/node_modules/*
-
+node_modules/*
+gitrev
+.git
+.gitignore
+.npm
+.nvmrc
+nodemon.json
 app.js
-app/js/*
-
-test/unit/js/*
-test/acceptance/js/*
-
-forever/
-
-**.swp
-
-# Redis cluster
-**/appendonly.aof
-**/dump.rdb
-**/nodes.conf
+**/js/*
diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile
new file mode 100644
index 0000000000..aabf01ad91
--- /dev/null
+++ b/services/document-updater/Dockerfile
@@ -0,0 +1,22 @@
+FROM node:6.9.5 as app
+
+WORKDIR /app
+
+#wildcard as some files may not be in all repos
+COPY package*.json npm-shrink*.json /app/
+
+RUN npm install --quiet
+
+COPY . /app
+
+
+RUN npm run compile:all
+
+FROM node:6.9.5
+
+COPY --from=app /app /app
+
+WORKDIR /app
+USER node
+
+CMD ["node","app.js"]
diff --git a/services/document-updater/Jenkinsfile b/services/document-updater/Jenkinsfile
index ab90aaae29..bc9ba0142f 100644
--- a/services/document-updater/Jenkinsfile
+++ b/services/document-updater/Jenkinsfile
@@ -9,34 +9,9 @@ pipeline {
   }
 
   stages {
-    stage('Install') {
-      agent {
-        docker {
-          image 'node:6.9.5'
-          args "-v /var/lib/jenkins/.npm:/tmp/.npm -e HOME=/tmp"
-          reuseNode true
-        }
-      }
+    stage('Build') {
       steps {
-        // we need to disable logallrefupdates, else git clones 
-        // during the npm install will require git to lookup the 
-        // user id which does not exist in the container's 
-        // /etc/passwd file, causing the clone to fail.
-        sh 'git config --global core.logallrefupdates false'
-        sh 'rm -rf node_modules'
-        sh 'npm install && npm rebuild'
-      }
-    }
-
-    stage('Compile') {
-      agent {
-        docker {
-          image 'node:6.9.5'
-          reuseNode true
-        }
-      }
-      steps {
-        sh 'npm run compile:all'
+        sh 'make build'
       }
     }
 
@@ -54,12 +29,7 @@ pipeline {
 
     stage('Package and publish build') {
       steps {
-        sh 'echo ${BUILD_NUMBER} > build_number.txt'
-        sh 'touch build.tar.gz' // Avoid tar warning about files changing during read
-        sh 'tar -czf build.tar.gz --exclude=build.tar.gz --exclude-vcs .'
-        withAWS(credentials:'S3_CI_BUILDS_AWS_KEYS', region:"${S3_REGION_BUILD_ARTEFACTS}") {
-            s3Upload(file:'build.tar.gz', bucket:"${S3_BUCKET_BUILD_ARTEFACTS}", path:"${JOB_NAME}/${BUILD_NUMBER}.tar.gz")
-        }
+        sh 'make publish'
       }
     }
 
diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile
index 10adbe3866..215b56a9e9 100644
--- a/services/document-updater/Makefile
+++ b/services/document-updater/Makefile
@@ -1,13 +1,18 @@
 # 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.0.1
+# Version: 1.1.3
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 PROJECT_NAME = document-updater
 DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml
-DOCKER_COMPOSE := docker-compose ${DOCKER_COMPOSE_FLAGS}
+DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
+	BRANCH_NAME=$(BRANCH_NAME) \
+	PROJECT_NAME=$(PROJECT_NAME) \
+	MOCHA_GREP=${MOCHA_GREP} \
+	docker-compose ${DOCKER_COMPOSE_FLAGS}
+
 
 clean:
 	rm -f app.js
@@ -18,12 +23,20 @@ clean:
 test: test_unit test_acceptance
 
 test_unit:
-	@[ -d test/unit ] && $(DOCKER_COMPOSE) run --rm test_unit -- ${MOCHA_ARGS} || echo "document-updater has no unit tests"
+	@[ ! -d test/unit ] && echo "document-updater has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit
 
-test_acceptance: test_clean # clear the database before each acceptance test run
-	@[ -d test/acceptance ] && $(DOCKER_COMPOSE) run --rm test_acceptance -- ${MOCHA_ARGS} || echo "document-updater has no acceptance tests"
+test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run
+	@[ ! -d test/acceptance ] && echo "document-updater has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
 
 test_clean:
-	$(DOCKER_COMPOSE) down -t 0
+	$(DOCKER_COMPOSE) down -v -t 0
+
+test_acceptance_pre_run:
+	@[ ! -f test/acceptance/scripts/pre-run ] && echo "document-updater has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/scripts/pre-run
+build:
+	docker build --pull --tag gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) .
+
+publish:
+	docker push gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 
 .PHONY: clean test test_unit test_acceptance test_clean build publish
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index 9f40ba879d..21c006641e 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/docker-compose.ci.yml
@@ -1,33 +1,32 @@
 # 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.0.1
+# Version: 1.1.3
 
 version: "2"
 
 services:
   test_unit:
-    image: node:6.9.5
-    volumes:
-      - .:/app
-    working_dir: /app
-    entrypoint: npm run test:unit:_run
+    image: gcr.io/csh-gcdm-test/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
+    user: node
+    command: npm run test:unit:_run
 
   test_acceptance:
-    image: node:6.9.5
-    volumes:
-      - .:/app
-    working_dir: /app
+    build: .
+    image: gcr.io/csh-gcdm-test/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
     environment:
       REDIS_HOST: redis
       MONGO_HOST: mongo
+      POSTGRES_HOST: postgres
     depends_on:
-      - redis
       - mongo
-    entrypoint: npm run test:acceptance:_run
+      - redis
+    user: node
+    command: npm run test:acceptance:_run
 
   redis:
     image: redis
 
   mongo:
     image: mongo:3.4
+
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index d55ca56580..f24caa8883 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/docker-compose.yml
@@ -1,33 +1,39 @@
 # 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.0.1
+# Version: 1.1.3
 
 version: "2"
 
 services:
   test_unit:
-    image: node:6.9.5
+    build: .
     volumes:
       - .:/app
     working_dir: /app
-    entrypoint: npm run test:unit
+    environment:
+      MOCHA_GREP: ${MOCHA_GREP}
+    command: npm run test:unit
+    user: node
 
   test_acceptance:
-    image: node:6.9.5
+    build: .
     volumes:
       - .:/app
+    working_dir: /app
     environment:
       REDIS_HOST: redis
       MONGO_HOST: mongo
+      POSTGRES_HOST: postgres
+      MOCHA_GREP: ${MOCHA_GREP}
+    user: node
     depends_on:
-      - redis
       - mongo
-    working_dir: /app
-    entrypoint: npm run test:acceptance
-
+      - redis
+    command: npm run test:acceptance
   redis:
     image: redis
 
   mongo:
     image: mongo:3.4
+
diff --git a/services/document-updater/nodemon.json b/services/document-updater/nodemon.json
index 9a3be8d966..98db38d71b 100644
--- a/services/document-updater/nodemon.json
+++ b/services/document-updater/nodemon.json
@@ -8,9 +8,12 @@
   "execMap": {
     "js": "npm run start"
   },
+
   "watch": [
     "app/coffee/",
-    "app.coffee"
+    "app.coffee",
+    "config/"
   ],
   "ext": "coffee"
+
 }
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index ce5aa9d18c..a23ae73427 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -7,14 +7,14 @@
     "url": "https://github.com/sharelatex/document-updater-sharelatex.git"
   },
   "scripts": {
-    "compile:app": "coffee -o app/js -c app/coffee && coffee -c app.coffee",
-    "start": "npm run compile:app && node app.js",
+    "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 15000 --exit $@ test/acceptance/js",
-    "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- $@",
+    "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
     "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
-    "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- $@",
-    "compile:unit_tests": "[ -e test/unit ] && coffee -o test/unit/js -c test/unit/coffee || echo 'No unit tests to compile'",
-    "compile:acceptance_tests": "[ -e test/acceptance ] && coffee -o test/acceptance/js -c test/acceptance/coffee || echo 'No acceptance tests to compile'",
+    "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- --grep=$MOCHA_GREP",
+    "compile:unit_tests": "[ ! -e test/unit/coffee ] &&  echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee",
+    "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee",
     "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests",
     "nodemon": "nodemon --config nodemon.json"
   },

From 3db7377d7409eecd86d11c0872aa8cc264f19ad8 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 28 Sep 2018 15:11:17 +0100
Subject: [PATCH 02/28] add process.env["REDIS_PASSWORD"]

---
 services/document-updater/config/settings.defaults.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index 18f2b1570b..840f482a16 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -23,7 +23,7 @@ module.exports =
 		realtime:
 			port: "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
-			password:""
+			password: process.env["REDIS_PASSWORD"]
 			key_schema:
 				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
 			# cluster: [{
@@ -35,7 +35,7 @@ module.exports =
 		documentupdater:
 			port: "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
-			password: ""
+			password: process.env["REDIS_PASSWORD"]
 			key_schema:
 				blockingKey: ({doc_id}) -> "Blocking:#{doc_id}"
 				docLines: ({doc_id}) -> "doclines:#{doc_id}"
@@ -66,7 +66,7 @@ module.exports =
 		history:
 			port: "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
-			password:""
+			password: process.env["REDIS_PASSWORD"]
 			key_schema:
 				uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:#{doc_id}"
 				docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:#{project_id}"
@@ -84,7 +84,7 @@ module.exports =
 		lock:
 			port: "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
-			password:""
+			password: process.env["REDIS_PASSWORD"]
 			key_schema:
 				blockingKey: ({doc_id}) -> "Blocking:#{doc_id}"
 			# cluster: [{

From 93cf5742514eaf7decf9836c18916b73a80163f7 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 28 Sep 2018 15:13:47 +0100
Subject: [PATCH 03/28] upgrade build scripts 1.1.9

---
 .../.github/ISSUE_TEMPLATE.md                 | 38 ++++++++++++++
 .../.github/PULL_REQUEST_TEMPLATE.md          | 45 ++++++++++++++++
 services/document-updater/Jenkinsfile         | 51 ++++++++++++++++++-
 services/document-updater/Makefile            | 11 ++--
 services/document-updater/buildscript.txt     |  9 ++++
 .../document-updater/docker-compose.ci.yml    |  9 ++--
 services/document-updater/docker-compose.yml  |  4 +-
 services/document-updater/package.json        |  9 ++--
 8 files changed, 163 insertions(+), 13 deletions(-)
 create mode 100644 services/document-updater/.github/ISSUE_TEMPLATE.md
 create mode 100644 services/document-updater/.github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 services/document-updater/buildscript.txt

diff --git a/services/document-updater/.github/ISSUE_TEMPLATE.md b/services/document-updater/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..e0093aa90c
--- /dev/null
+++ b/services/document-updater/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,38 @@
+<!-- BUG REPORT TEMPLATE -->
+
+## Steps to Reproduce
+<!-- Describe the steps leading up to when / where you found the bug. -->
+<!-- Screenshots may be helpful here. -->
+
+1.
+2.
+3.
+
+## Expected Behaviour
+<!-- What should have happened when you completed the steps above? -->
+
+## Observed Behaviour
+<!-- What actually happened when you completed the steps above? -->
+<!-- Screenshots may be helpful here. -->
+
+## Context
+<!-- How has this issue affected you? What were you trying to accomplish? -->
+
+## Technical Info
+<!-- Provide any technical details that may be applicable (or N/A if not applicable). -->
+
+* URL:
+* Browser Name and version:
+* Operating System and version (desktop or mobile):
+* Signed in as:
+* Project and/or file:
+
+## Analysis
+<!--- Optionally, document investigation of / suggest a fix for the bug, e.g. 'comes from this line / commit' -->
+
+## Who Needs to Know?
+<!-- If you want to bring this to the attention of particular people, @-mention them below. -->
+<!-- If a user reported this bug and should be notified when it is fixed, provide the Front conversation link. -->
+
+-
+-
diff --git a/services/document-updater/.github/PULL_REQUEST_TEMPLATE.md b/services/document-updater/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..ed25ee83c1
--- /dev/null
+++ b/services/document-updater/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,45 @@
+<!-- Please review https://github.com/overleaf/write_latex/blob/master/.github/CONTRIBUTING.md for guidance on what is expected in each section. -->
+
+### 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/services/document-updater/Jenkinsfile b/services/document-updater/Jenkinsfile
index bc9ba0142f..3af2b785b8 100644
--- a/services/document-updater/Jenkinsfile
+++ b/services/document-updater/Jenkinsfile
@@ -3,12 +3,33 @@ String cron_string = BRANCH_NAME == "master" ? "@daily" : ""
 pipeline {
   agent any
 
+  environment {
+    GIT_PROJECT = "document-updater-sharelatex"
+    JENKINS_WORKFLOW = "document-updater-sharelatex"
+    TARGET_URL = "${env.JENKINS_URL}blue/organizations/jenkins/${JENKINS_WORKFLOW}/detail/$BRANCH_NAME/$BUILD_NUMBER/pipeline"
+    GIT_API_URL = "https://api.github.com/repos/sharelatex/${GIT_PROJECT}/statuses/$GIT_COMMIT"
+  }
+
   triggers {
     pollSCM('* * * * *')
     cron(cron_string)
   }
 
   stages {
+    stage('Install') {
+      steps {
+        withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) {
+          sh "curl $GIT_API_URL \
+            --data '{ \
+            \"state\" : \"pending\", \
+            \"target_url\": \"$TARGET_URL\", \
+            \"description\": \"Your build is underway\", \
+            \"context\": \"ci/jenkins\" }' \
+            -u $GH_AUTH_USERNAME:$GH_AUTH_PASSWORD"
+        }
+      }
+    }
+
     stage('Build') {
       steps {
         sh 'make build'
@@ -29,7 +50,13 @@ pipeline {
 
     stage('Package and publish build') {
       steps {
-        sh 'make publish'
+        
+        withCredentials([file(credentialsId: 'gcr.io_overleaf-ops', variable: 'DOCKER_REPO_KEY_PATH')]) {
+          sh 'docker login -u _json_key --password-stdin https://gcr.io/overleaf-ops < ${DOCKER_REPO_KEY_PATH}'
+        }
+        sh 'DOCKER_REPO=gcr.io/overleaf-ops make publish'
+        sh 'docker logout https://gcr.io/overleaf-ops'
+        
       }
     }
 
@@ -47,6 +74,19 @@ pipeline {
   post {
     always {
       sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_clean'
+      sh 'make clean'
+    }
+
+    success {
+      withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) {
+        sh "curl $GIT_API_URL \
+          --data '{ \
+          \"state\" : \"success\", \
+          \"target_url\": \"$TARGET_URL\", \
+          \"description\": \"Your build succeeded!\", \
+          \"context\": \"ci/jenkins\" }' \
+          -u $GH_AUTH_USERNAME:$GH_AUTH_PASSWORD"
+      }
     }
 
     failure {
@@ -54,6 +94,15 @@ pipeline {
            to: "${EMAIL_ALERT_TO}",
            subject: "Jenkins build failed: ${JOB_NAME}:${BUILD_NUMBER}",
            body: "Build: ${BUILD_URL}")
+      withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) {
+        sh "curl $GIT_API_URL \
+          --data '{ \
+          \"state\" : \"failure\", \
+          \"target_url\": \"$TARGET_URL\", \
+          \"description\": \"Your build failed\", \
+          \"context\": \"ci/jenkins\" }' \
+          -u $GH_AUTH_USERNAME:$GH_AUTH_PASSWORD"
+      }
     }
   }
 
diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile
index 215b56a9e9..09b26a6055 100644
--- a/services/document-updater/Makefile
+++ b/services/document-updater/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.3
+# Version: 1.1.9
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -15,6 +15,8 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 
 
 clean:
+	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	rm -f app.js
 	rm -rf app/js
 	rm -rf test/unit/js
@@ -34,9 +36,12 @@ test_clean:
 test_acceptance_pre_run:
 	@[ ! -f test/acceptance/scripts/pre-run ] && echo "document-updater has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/scripts/pre-run
 build:
-	docker build --pull --tag gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) .
+	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		.
 
 publish:
-	docker push gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+
+	docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 
 .PHONY: clean test test_unit test_acceptance test_clean build publish
diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt
new file mode 100644
index 0000000000..c9ccb323b4
--- /dev/null
+++ b/services/document-updater/buildscript.txt
@@ -0,0 +1,9 @@
+--script-version=1.1.9
+document-updater
+--node-version=6.9.5
+--acceptance-creds=None
+--language=coffeescript
+--dependencies=mongo,redis
+--docker-repos=gcr.io/overleaf-ops
+--kube=false
+--build-target=docker
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index 21c006641e..17c4ddd2bf 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/docker-compose.ci.yml
@@ -1,23 +1,25 @@
 # 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.3
+# Version: 1.1.9
 
 version: "2"
 
 services:
   test_unit:
-    image: gcr.io/csh-gcdm-test/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
+    image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
     user: node
     command: npm run test:unit:_run
 
   test_acceptance:
     build: .
-    image: gcr.io/csh-gcdm-test/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
+    image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
     environment:
+      ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
+      MOCHA_GREP: ${MOCHA_GREP}
     depends_on:
       - mongo
       - redis
@@ -29,4 +31,3 @@ services:
 
   mongo:
     image: mongo:3.4
-
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index f24caa8883..dcbc14e683 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/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.3
+# Version: 1.1.9
 
 version: "2"
 
@@ -22,6 +22,7 @@ services:
       - .:/app
     working_dir: /app
     environment:
+      ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
@@ -31,6 +32,7 @@ services:
       - mongo
       - redis
     command: npm run test:acceptance
+
   redis:
     image: redis
 
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index a23ae73427..7d13caa763 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -9,14 +9,15 @@
   "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')",
     "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js",
-    "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/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",
-    "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
+    "test:unit:_run": "mocha --recursive --reporter spec --exit $@ test/unit/js",
     "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "compile:unit_tests": "[ ! -e test/unit/coffee ] &&  echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee",
     "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee",
-    "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests",
-    "nodemon": "nodemon --config nodemon.json"
+    "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests && npm run compile:smoke_tests",
+    "nodemon": "nodemon --config nodemon.json",
+    "compile:smoke_tests": "[ ! -e test/smoke/coffee ] &&  echo 'No smoke tests to compile' || coffee -o test/smoke/js -c test/smoke/coffee"
   },
   "dependencies": {
     "async": "^2.5.0",

From ff673c71d599824e68a3960bc0abb03f21e3ae03 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 28 Sep 2018 17:04:25 +0100
Subject: [PATCH 04/28] set redis port via env var

---
 services/document-updater/config/settings.defaults.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index 840f482a16..825c1772cc 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -21,7 +21,7 @@ module.exports =
 
 	redis:
 		realtime:
-			port: "6379"
+			port: process.env["REDIS_PORT"] or "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
 			password: process.env["REDIS_PASSWORD"]
 			key_schema:
@@ -33,7 +33,7 @@ module.exports =
 			# key_schema:
 			# 	pendingUpdates: ({doc_id}) -> "PendingUpdates:{#{doc_id}}"
 		documentupdater:
-			port: "6379"
+			port: process.env["REDIS_PORT"] or "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
 			password: process.env["REDIS_PASSWORD"]
 			key_schema:
@@ -64,7 +64,7 @@ module.exports =
 			# 	ranges: ({doc_id}) -> "Ranges:{#{doc_id}}"
 			# 	projectState: ({project_id}) -> "ProjectState:{#{project_id}}"
 		history:
-			port: "6379"
+			port: process.env["REDIS_PORT"] or "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
 			password: process.env["REDIS_PASSWORD"]
 			key_schema:
@@ -82,7 +82,7 @@ module.exports =
 			# 	uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:{#{doc_id}}"
 			# 	docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}"
 		lock:
-			port: "6379"
+			port: process.env["REDIS_PORT"] or "6379"
 			host: process.env["REDIS_HOST"] or "localhost"
 			password: process.env["REDIS_PASSWORD"]
 			key_schema:

From 5f046ed32960cb00507f06700622af68998bf25f Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Tue, 27 Nov 2018 13:41:10 +0000
Subject: [PATCH 05/28] install metrics route and bump metrics version

---
 services/document-updater/app.coffee   | 6 ++++--
 services/document-updater/package.json | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index a1a18d5889..516af85fea 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -1,3 +1,6 @@
+Metrics = require "metrics-sharelatex"
+Metrics.initialize("doc-updater")
+
 express = require('express')
 http = require("http")
 Settings = require('settings-sharelatex')
@@ -14,8 +17,7 @@ Errors = require "./app/js/Errors"
 HttpController = require "./app/js/HttpController"
 
 Path = require "path"
-Metrics = require "metrics-sharelatex"
-Metrics.initialize("doc-updater")
+
 Metrics.mongodb.monitor(Path.resolve(__dirname + "/node_modules/mongojs/node_modules/mongodb"), logger)
 Metrics.event_loop.monitor(logger, 100)
 
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 7d13caa763..ec17378d85 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -25,7 +25,7 @@
     "express": "3.3.4",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
     "lynx": "0.0.11",
-    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.5.0",
+    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.7",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
     "request": "2.25.0",
     "requestretry": "^1.12.0",

From 9437cf8b027e6ef7ae60f6004df14744c5f501d1 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 5 Dec 2018 15:11:24 +0000
Subject: [PATCH 06/28] explicity split redis config values

---
 .../config/settings.defaults.coffee           | 24 +++++++++----------
 services/document-updater/package.json        |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index bad2d1429d..e23510afda 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -21,9 +21,9 @@ module.exports =
 
 	redis:
 		realtime:
-			port: process.env["REDIS_PORT"] or "6379"
-			host: process.env["REDIS_HOST"] or "localhost"
-			password: process.env["REDIS_PASSWORD"]
+			port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
 				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
 			# cluster: [{
@@ -33,9 +33,9 @@ module.exports =
 			# key_schema:
 			# 	pendingUpdates: ({doc_id}) -> "PendingUpdates:{#{doc_id}}"
 		documentupdater:
-			port: process.env["REDIS_PORT"] or "6379"
-			host: process.env["REDIS_HOST"] or "localhost"
-			password: process.env["REDIS_PASSWORD"]
+			port: process.env["DOC_UPDATER_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["DOC_UPDATER_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["DOC_UPDATER_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
 				blockingKey: ({doc_id}) -> "Blocking:#{doc_id}"
 				docLines: ({doc_id}) -> "doclines:#{doc_id}"
@@ -64,9 +64,9 @@ module.exports =
 			# 	ranges: ({doc_id}) -> "Ranges:{#{doc_id}}"
 			# 	projectState: ({project_id}) -> "ProjectState:{#{project_id}}"
 		history:
-			port: process.env["REDIS_PORT"] or "6379"
-			host: process.env["REDIS_HOST"] or "localhost"
-			password: process.env["REDIS_PASSWORD"]
+			port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["HISTORY_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
 				uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:#{doc_id}"
 				docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:#{project_id}"
@@ -83,9 +83,9 @@ module.exports =
 			# 	uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:{#{doc_id}}"
 			# 	docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}"
 		lock:
-			port: process.env["REDIS_PORT"] or "6379"
-			host: process.env["REDIS_HOST"] or "localhost"
-			password: process.env["REDIS_PASSWORD"]
+			port: process.env["LOCK_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["LOCK_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["LOCK_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
 				blockingKey: ({doc_id}) -> "Blocking:#{doc_id}"
 			# cluster: [{
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index ec17378d85..006509bec7 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -25,7 +25,7 @@
     "express": "3.3.4",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
     "lynx": "0.0.11",
-    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.7",
+    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.8",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
     "request": "2.25.0",
     "requestretry": "^1.12.0",

From 25e1ad74912cd15b8395963d9f645bba0ede0e53 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 5 Dec 2018 16:17:41 +0000
Subject: [PATCH 07/28] remove redis.realtime

real time pushes data into the document updater redis instance
---
 services/document-updater/app.coffee                |  9 ---------
 .../app/coffee/DispatchManager.coffee               |  2 +-
 .../app/coffee/RealTimeRedisManager.coffee          |  4 ++--
 .../config/settings.defaults.coffee                 | 13 +------------
 .../coffee/helpers/DocUpdaterClient.coffee          |  6 +++---
 .../DispatchManager/DispatchManagerTests.coffee     |  8 ++++++--
 .../ProjectHistoryRedisManagerTests.coffee          |  2 ++
 .../RealTimeRedisManagerTests.coffee                |  2 +-
 8 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index 516af85fea..b8a6a63a3e 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -70,15 +70,6 @@ app.get '/status', (req, res)->
 	else
 		res.send('document updater is alive')
 
-webRedisClient = require("redis-sharelatex").createClient(Settings.redis.realtime)
-app.get "/health_check/redis", (req, res, next) ->
-	webRedisClient.healthCheck (error) ->
-		if error?
-			logger.err {err: error}, "failed redis health check"
-			res.send 500
-		else
-			res.send 200
-
 docUpdaterRedisClient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
 app.get "/health_check/redis_cluster", (req, res, next) ->
 	docUpdaterRedisClient.healthCheck (error) ->
diff --git a/services/document-updater/app/coffee/DispatchManager.coffee b/services/document-updater/app/coffee/DispatchManager.coffee
index 93a22bfc07..e751534068 100644
--- a/services/document-updater/app/coffee/DispatchManager.coffee
+++ b/services/document-updater/app/coffee/DispatchManager.coffee
@@ -10,7 +10,7 @@ RateLimitManager = require('./RateLimitManager')
 
 module.exports = DispatchManager =
 	createDispatcher: (RateLimiter) ->
-		client = redis.createClient(Settings.redis.realtime)
+		client = redis.createClient(Settings.redis.documentupdater)
 		worker = {
 			client: client
 			_waitForUpdateThenDispatchWorker: (callback = (error) ->) ->
diff --git a/services/document-updater/app/coffee/RealTimeRedisManager.coffee b/services/document-updater/app/coffee/RealTimeRedisManager.coffee
index 7da7ca1f64..64bbe572b8 100644
--- a/services/document-updater/app/coffee/RealTimeRedisManager.coffee
+++ b/services/document-updater/app/coffee/RealTimeRedisManager.coffee
@@ -1,6 +1,6 @@
 Settings = require('settings-sharelatex')
-rclient = require("redis-sharelatex").createClient(Settings.redis.realtime)
-Keys = Settings.redis.realtime.key_schema
+rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
+Keys = Settings.redis.documentupdater.key_schema
 logger = require('logger-sharelatex')
 
 MAX_OPS_PER_ITERATION = 8 # process a limited number of ops for safety
diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index e23510afda..7f36e47207 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -20,18 +20,6 @@ module.exports =
 			url: "http://#{process.env["PROJECT_HISTORY_HOST"] or "localhost"}:3054"
 
 	redis:
-		realtime:
-			port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
-			host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
-			password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
-			key_schema:
-				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
-			# cluster: [{
-			# 	port: "7000"
-			# 	host: "localhost"
-			# }]
-			# key_schema:
-			# 	pendingUpdates: ({doc_id}) -> "PendingUpdates:{#{doc_id}}"
 		documentupdater:
 			port: process.env["DOC_UPDATER_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
 			host: process.env["DOC_UPDATER_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
@@ -49,6 +37,7 @@ module.exports =
 				projectHistoryId: ({doc_id}) -> "ProjectHistoryId:#{doc_id}"
 				projectState: ({project_id}) -> "ProjectState:#{project_id}"
 				unflushedTime: ({doc_id}) -> "UnflushedTime:#{doc_id}"
+				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
 			# cluster: [{
 			# 	port: "7000"
 			# 	host: "localhost"
diff --git a/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee b/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee
index 7f50d64372..587e6f3af9 100644
--- a/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee
+++ b/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee
@@ -1,10 +1,10 @@
 Settings = require('settings-sharelatex')
-rclient = require("redis-sharelatex").createClient(Settings.redis.realtime)
-keys = Settings.redis.realtime.key_schema
+rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
+keys = Settings.redis.documentupdater.key_schema
 request = require("request").defaults(jar: false)
 async = require "async"
 
-rclient_sub = require("redis-sharelatex").createClient(Settings.redis.realtime)
+rclient_sub = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
 rclient_sub.subscribe "applied-ops"
 rclient_sub.setMaxListeners(0)
 	
diff --git a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
index b749e83a5d..85cdcb5a7e 100644
--- a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
@@ -4,16 +4,21 @@ should = chai.should()
 modulePath = "../../../../app/js/DispatchManager.js"
 SandboxedModule = require('sandboxed-module')
 
+
 describe "DispatchManager", ->
 	beforeEach ->
+		@timeout(3000)
 		@DispatchManager = SandboxedModule.require modulePath, requires:
 			"./UpdateManager" : @UpdateManager = {}
 			"logger-sharelatex": @logger = { log: sinon.stub() }
 			"settings-sharelatex": @settings =
 				redis:
-					realtime: {}
+					documentupdater: {}
 			"redis-sharelatex": @redis = {}
 			"./RateLimitManager": {}
+			"./Metrics":
+				Timer: ->
+					done: ->
 		@callback = sinon.stub()
 		@RateLimiter = { run: (task,cb) -> task(cb) } # run task without rate limit
 
@@ -22,7 +27,6 @@ describe "DispatchManager", ->
 			@client =
 				auth: sinon.stub()
 			@redis.createClient = sinon.stub().returns @client
-			
 			@worker = @DispatchManager.createDispatcher(@RateLimiter)
 			
 		it "should create a new redis client", ->
diff --git a/services/document-updater/test/unit/coffee/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.coffee b/services/document-updater/test/unit/coffee/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.coffee
index 8c6ff5c7d7..a93545b250 100644
--- a/services/document-updater/test/unit/coffee/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.coffee
@@ -24,6 +24,8 @@ describe "ProjectHistoryRedisManager", ->
 				}
 				"redis-sharelatex":
 					createClient: () => @rclient
+				"logger-sharelatex":
+					log:->
 			globals:
 				JSON: @JSON = JSON
 
diff --git a/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee b/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee
index a04da996dc..375b85df78 100644
--- a/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee
@@ -15,7 +15,7 @@ describe "RealTimeRedisManager", ->
 			"redis-sharelatex": createClient: () => @rclient
 			"settings-sharelatex":
 				redis:
-					realtime: @settings =
+					documentupdater: @settings =
 						key_schema:
 							pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
 			"logger-sharelatex": { log: () -> }

From 2505be283a574c4cc4fb242e52471896fc9f9b1e Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 13 Dec 2018 11:03:08 +0000
Subject: [PATCH 08/28] turn down logging, use logger.info for less important
 data

---
 .../app/coffee/DocumentManager.coffee             |  2 +-
 .../app/coffee/HistoryRedisManager.coffee         |  2 +-
 .../app/coffee/HttpController.coffee              |  8 ++++----
 .../app/coffee/RangesManager.coffee               |  6 +++---
 .../app/coffee/RedisManager.coffee                |  2 +-
 .../app/coffee/ShareJsUpdateManager.coffee        |  4 ++--
 .../app/coffee/UpdateManager.coffee               |  2 +-
 .../DocumentManager/DocumentManagerTests.coffee   |  2 +-
 .../HistoryRedisManagerTests.coffee               |  4 +++-
 .../HttpController/HttpControllerTests.coffee     |  8 ++++----
 .../RangesManager/RangesManagerTests.coffee       | 15 ++++++++++-----
 .../coffee/RedisManager/RedisManagerTests.coffee  |  2 +-
 .../ShareJsUpdateManagerTests.coffee              |  2 +-
 .../UpdateManager/UpdateManagerTests.coffee       |  2 +-
 14 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/services/document-updater/app/coffee/DocumentManager.coffee b/services/document-updater/app/coffee/DocumentManager.coffee
index 39713a1981..7b8caa3e20 100644
--- a/services/document-updater/app/coffee/DocumentManager.coffee
+++ b/services/document-updater/app/coffee/DocumentManager.coffee
@@ -25,7 +25,7 @@ module.exports = DocumentManager =
 				logger.log {project_id, doc_id}, "doc not in redis so getting from persistence API"
 				PersistenceManager.getDoc project_id, doc_id, (error, lines, version, ranges, pathname, projectHistoryId) ->
 					return callback(error) if error?
-					logger.log {project_id, doc_id, lines, version, pathname, projectHistoryId}, "got doc from persistence API"
+					logger.info {project_id, doc_id, lines, version, pathname, projectHistoryId}, "got doc from persistence API"
 					RedisManager.putDocInMemory project_id, doc_id, lines, version, ranges, pathname, projectHistoryId, (error) ->
 						return callback(error) if error?
 						callback null, lines, version, ranges, pathname, projectHistoryId, null, false
diff --git a/services/document-updater/app/coffee/HistoryRedisManager.coffee b/services/document-updater/app/coffee/HistoryRedisManager.coffee
index d9a99a09aa..8c37132ada 100644
--- a/services/document-updater/app/coffee/HistoryRedisManager.coffee
+++ b/services/document-updater/app/coffee/HistoryRedisManager.coffee
@@ -7,7 +7,7 @@ module.exports = HistoryRedisManager =
 	recordDocHasHistoryOps: (project_id, doc_id, ops = [], callback = (error) ->) ->
 		if ops.length == 0
 			return callback(new Error("cannot push no ops")) # This should never be called with no ops, but protect against a redis error if we sent an empty array to rpush
-		logger.log project_id: project_id, doc_id: doc_id, "marking doc in project for history ops"
+		logger.info project_id: project_id, doc_id: doc_id, "marking doc in project for history ops"
 		rclient.sadd Keys.docsWithHistoryOps({project_id}), doc_id, (error) ->
 			return callback(error) if error?
 			callback()
diff --git a/services/document-updater/app/coffee/HttpController.coffee b/services/document-updater/app/coffee/HttpController.coffee
index 93f915d662..6cf03f2cd6 100644
--- a/services/document-updater/app/coffee/HttpController.coffee
+++ b/services/document-updater/app/coffee/HttpController.coffee
@@ -11,7 +11,7 @@ module.exports = HttpController =
 	getDoc: (req, res, next = (error) ->) ->
 		doc_id = req.params.doc_id
 		project_id = req.params.project_id
-		logger.log project_id: project_id, doc_id: doc_id, "getting doc via http"
+		logger.info project_id: project_id, doc_id: doc_id, "getting doc via http"
 		timer = new Metrics.Timer("http.getDoc")
 
 		if req.query?.fromVersion?
@@ -22,7 +22,7 @@ module.exports = HttpController =
 		DocumentManager.getDocAndRecentOpsWithLock project_id, doc_id, fromVersion, (error, lines, version, ops, ranges, pathname) ->
 			timer.done()
 			return next(error) if error?
-			logger.log project_id: project_id, doc_id: doc_id, "got doc via http"
+			logger.info project_id: project_id, doc_id: doc_id, "got doc via http"
 			if !lines? or !version?
 				return next(new Errors.NotFoundError("document not found"))
 			res.send JSON.stringify
@@ -44,13 +44,13 @@ module.exports = HttpController =
 		projectStateHash = req.query?.state
 		# exclude is string of existing docs "id:version,id:version,..."
 		excludeItems = req.query?.exclude?.split(',') or []
-		logger.log project_id: project_id, exclude: excludeItems, "getting docs via http"
+		logger.info project_id: project_id, exclude: excludeItems, "getting docs via http"
 		timer = new Metrics.Timer("http.getAllDocs")
 		excludeVersions = {}
 		for item in excludeItems
 			[id,version] = item?.split(':')
 			excludeVersions[id] = version
-		logger.log {project_id: project_id, projectStateHash: projectStateHash, excludeVersions: excludeVersions}, "excluding versions"
+		logger.info {project_id: project_id, projectStateHash: projectStateHash, excludeVersions: excludeVersions}, "excluding versions"
 		ProjectManager.getProjectDocsAndFlushIfOld project_id, projectStateHash, excludeVersions, (error, result) ->
 			timer.done()
 			if error instanceof Errors.ProjectStateChangedError
diff --git a/services/document-updater/app/coffee/RangesManager.coffee b/services/document-updater/app/coffee/RangesManager.coffee
index d0653bb6a2..ce3fa5dfca 100644
--- a/services/document-updater/app/coffee/RangesManager.coffee
+++ b/services/document-updater/app/coffee/RangesManager.coffee
@@ -30,12 +30,12 @@ module.exports = RangesManager =
 			return callback(error)
 
 		response = RangesManager._getRanges rangesTracker
-		logger.log {project_id, doc_id, changesCount: response.changes?.length, commentsCount: response.comments?.length}, "applied updates to ranges"
+		logger.info {project_id, doc_id, changesCount: response.changes?.length, commentsCount: response.comments?.length}, "applied updates to ranges"
 		callback null, response
 
 	acceptChanges: (change_ids, ranges, callback = (error, ranges) ->) ->
 		{changes, comments} = ranges
-		logger.log "accepting #{ change_ids.length } changes in ranges"
+		logger.info "accepting #{ change_ids.length } changes in ranges"
 		rangesTracker = new RangesTracker(changes, comments)
 		rangesTracker.removeChangeIds(change_ids)
 		response = RangesManager._getRanges(rangesTracker)
@@ -43,7 +43,7 @@ module.exports = RangesManager =
 
 	deleteComment: (comment_id, ranges, callback = (error, ranges) ->) ->
 		{changes, comments} = ranges
-		logger.log {comment_id}, "deleting comment in ranges"
+		logger.info {comment_id}, "deleting comment in ranges"
 		rangesTracker = new RangesTracker(changes, comments)
 		rangesTracker.removeCommentId(comment_id)
 		response = RangesManager._getRanges(rangesTracker)
diff --git a/services/document-updater/app/coffee/RedisManager.coffee b/services/document-updater/app/coffee/RedisManager.coffee
index 25dbafc6e7..064c6144af 100644
--- a/services/document-updater/app/coffee/RedisManager.coffee
+++ b/services/document-updater/app/coffee/RedisManager.coffee
@@ -233,7 +233,7 @@ module.exports = RedisManager =
 			newHash = RedisManager._computeHash(newDocLines)
 
 			opVersions = appliedOps.map (op) -> op?.v
-			logger.log doc_id: doc_id, version: newVersion, hash: newHash, op_versions: opVersions, "updating doc in redis"
+			logger.info doc_id: doc_id, version: newVersion, hash: newHash, op_versions: opVersions, "updating doc in redis"
 
 			RedisManager._serializeRanges ranges, (error, ranges) ->
 				if error?
diff --git a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee
index a5cc6070cb..7a79b82724 100644
--- a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee
+++ b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee
@@ -20,7 +20,7 @@ module.exports = ShareJsUpdateManager =
 		return model
 
 	applyUpdate: (project_id, doc_id, update, lines, version, callback = (error, updatedDocLines) ->) ->
-		logger.log project_id: project_id, doc_id: doc_id, update: update, "applying sharejs updates"
+		logger.info project_id: project_id, doc_id: doc_id, update: update, "applying sharejs updates"
 		jobs = []
 
 		# We could use a global model for all docs, but we're hitting issues with the
@@ -39,7 +39,7 @@ module.exports = ShareJsUpdateManager =
 					ShareJsUpdateManager._sendOp(project_id, doc_id, update)
 				else
 					return callback(error)
-			logger.log project_id: project_id, doc_id: doc_id, error: error, "applied update"
+			logger.info project_id: project_id, doc_id: doc_id, error: error, "applied update"
 			model.getSnapshot doc_key, (error, data) =>
 				return callback(error) if error?
 				docLines = data.snapshot.split(/\r\n|\n|\r/)
diff --git a/services/document-updater/app/coffee/UpdateManager.coffee b/services/document-updater/app/coffee/UpdateManager.coffee
index bfcfb806ca..43aea49512 100644
--- a/services/document-updater/app/coffee/UpdateManager.coffee
+++ b/services/document-updater/app/coffee/UpdateManager.coffee
@@ -47,7 +47,7 @@ module.exports = UpdateManager =
 		profile = new Profiler("fetchAndApplyUpdates", {project_id, doc_id})
 		RealTimeRedisManager.getPendingUpdatesForDoc doc_id, (error, updates) =>
 			return callback(error) if error?
-			logger.log {project_id: project_id, doc_id: doc_id, count: updates.length}, "processing updates"
+			logger.info {project_id: project_id, doc_id: doc_id, count: updates.length}, "processing updates"
 			if updates.length == 0
 				return callback()
 			profile.log("getPendingUpdatesForDoc")
diff --git a/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee
index c52bb4b30d..736ceeee2d 100644
--- a/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee
@@ -16,7 +16,7 @@ describe "DocumentManager", ->
 			"./HistoryManager": @HistoryManager =
 				flushDocChangesAsync: sinon.stub()
 				flushProjectChangesAsync: sinon.stub()
-			"logger-sharelatex": @logger = {log: sinon.stub()}
+			"logger-sharelatex": @logger = {log: sinon.stub(), info: sinon.stub()}
 			"./DocOpsManager": @DocOpsManager = {}
 			"./Metrics": @Metrics =
 				Timer: class Timer
diff --git a/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee b/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee
index ca3937d4c5..a1d0e11b81 100644
--- a/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee
@@ -19,7 +19,9 @@ describe "HistoryRedisManager", ->
 						key_schema:
 							uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:#{doc_id}"
 							docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:#{project_id}"
-			"logger-sharelatex": { log: () -> }
+			"logger-sharelatex":
+				log: ->
+				info: ->
 		@doc_id = "doc-id-123"
 		@project_id = "project-id-123"
 		@callback = sinon.stub()
diff --git a/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee b/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee
index ab6718c12a..46daa9a63b 100644
--- a/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee
+++ b/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee
@@ -12,7 +12,7 @@ describe "HttpController", ->
 			"./HistoryManager": @HistoryManager =
 				flushProjectChangesAsync: sinon.stub()
 			"./ProjectManager": @ProjectManager = {}
-			"logger-sharelatex" : @logger = { log: sinon.stub() }
+			"logger-sharelatex" : @logger = { log: sinon.stub(), info: sinon.stub() }
 			"./Metrics": @Metrics = {}
 			"./Errors" : Errors
 		@Metrics.Timer = class Timer
@@ -59,7 +59,7 @@ describe "HttpController", ->
 					.should.equal true
 
 			it "should log the request", ->
-				@logger.log
+				@logger.info
 					.calledWith(doc_id: @doc_id, project_id: @project_id, "getting doc via http")
 					.should.equal true
 
@@ -88,7 +88,7 @@ describe "HttpController", ->
 					.should.equal true
 
 			it "should log the request", ->
-				@logger.log
+				@logger.info
 					.calledWith(doc_id: @doc_id, project_id: @project_id, "getting doc via http")
 					.should.equal true
 
@@ -475,7 +475,7 @@ describe "HttpController", ->
 					.should.equal true
 
 			it "should log the request", ->
-				@logger.log
+				@logger.info
 					.calledWith({project_id: @project_id, exclude: []}, "getting docs via http")
 					.should.equal true
 
diff --git a/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee b/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee
index b11c73489e..e7322f0e63 100644
--- a/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee
@@ -7,10 +7,15 @@ SandboxedModule = require('sandboxed-module')
 
 describe "RangesManager", ->
 	beforeEach ->
+		@logger = 
+			error: sinon.stub()
+			log: sinon.stub()
+			warn: sinon.stub()
+			info: sinon.stub()
+
 		@RangesManager = SandboxedModule.require modulePath,
 			requires:
-				"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub() }
-
+				"logger-sharelatex": @logger 
 		@doc_id = "doc-id-123"
 		@project_id = "project-id-123"
 		@user_id = "user-id-123"
@@ -184,7 +189,7 @@ describe "RangesManager", ->
 		beforeEach ->
 			@RangesManager = SandboxedModule.require modulePath,
 				requires:
-					"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub() }
+					"logger-sharelatex": @logger
 					"./RangesTracker":@RangesTracker = SandboxedModule.require "../../../../app/js/RangesTracker.js"
 
 			@ranges = {
@@ -226,7 +231,7 @@ describe "RangesManager", ->
 					done()
 
 			it "should log the call with the correct number of changes", ->
-				@logger.log
+				@logger.info
 					.calledWith("accepting 1 changes in ranges")
 					.should.equal true
 
@@ -258,7 +263,7 @@ describe "RangesManager", ->
 					done()
 
 			it "should log the call with the correct number of changes", ->
-				@logger.log
+				@logger.info
 					.calledWith("accepting #{ @change_ids.length } changes in ranges")
 					.should.equal true
 
diff --git a/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee
index 4f6c24720e..9505339ddf 100644
--- a/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee
@@ -14,7 +14,7 @@ describe "RedisManager", ->
 		tk.freeze(new Date())
 		@RedisManager = SandboxedModule.require modulePath,
 			requires:
-				"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub() }
+				"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub(), info:-> }
 				"./ProjectHistoryRedisManager": @ProjectHistoryRedisManager = {}
 				"settings-sharelatex": @settings = {
 					documentupdater: {logHashErrors: {write:true, read:true}}
diff --git a/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee b/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee
index b7364b00a4..d95e7497fb 100644
--- a/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee
@@ -16,7 +16,7 @@ describe "ShareJsUpdateManager", ->
 						constructor: (@db) ->
 				"./ShareJsDB" : @ShareJsDB = { mockDB: true }
 				"redis-sharelatex" : createClient: () => @rclient = auth:->
-				"logger-sharelatex": @logger = { log: sinon.stub() }
+				"logger-sharelatex": @logger = { log: sinon.stub(), info: -> }
 				"./RealTimeRedisManager": @RealTimeRedisManager = {}
 			globals:
 				clearTimeout: @clearTimeout = sinon.stub()
diff --git a/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee b/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee
index 383bd1848e..623e2eec0c 100644
--- a/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee
@@ -16,7 +16,7 @@ describe "UpdateManager", ->
 			"./RealTimeRedisManager" : @RealTimeRedisManager = {}
 			"./ShareJsUpdateManager" : @ShareJsUpdateManager = {}
 			"./HistoryManager" : @HistoryManager = {}
-			"logger-sharelatex": @logger = { log: sinon.stub() }
+			"logger-sharelatex": @logger = { log: sinon.stub(), info:-> }
 			"./Metrics": @Metrics =
 				Timer: class Timer
 					done: sinon.stub()

From d9ec90f0e26a915dfdbb7f92be87798212440f98 Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Fri, 4 Jan 2019 09:22:09 +0000
Subject: [PATCH 09/28] Move to metrics v2 and shrinkwrap

---
 services/document-updater/app.coffee          |    1 +
 services/document-updater/npm-shrinkwrap.json | 2087 +++++++++++++++++
 services/document-updater/package.json        |    2 +-
 3 files changed, 2089 insertions(+), 1 deletion(-)
 create mode 100644 services/document-updater/npm-shrinkwrap.json

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index b8a6a63a3e..cbcaf23897 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -26,6 +26,7 @@ app.configure ->
 	app.use(Metrics.http.monitor(logger));
 	app.use express.bodyParser()
 	app.use app.router
+Metrics.injectMetricsRoute(app)
 
 DispatchManager.createAndStartDispatchers(Settings.dispatcherCount || 10)
 
diff --git a/services/document-updater/npm-shrinkwrap.json b/services/document-updater/npm-shrinkwrap.json
new file mode 100644
index 0000000000..a9c29cbc70
--- /dev/null
+++ b/services/document-updater/npm-shrinkwrap.json
@@ -0,0 +1,2087 @@
+{
+  "name": "document-updater-sharelatex",
+  "version": "0.1.4",
+  "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"
+    },
+    "@google-cloud/debug-agent": {
+      "version": "3.0.1",
+      "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",
+      "dependencies": {
+        "coffeescript": {
+          "version": "2.3.2",
+          "from": "coffeescript@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.3.2.tgz"
+        }
+      }
+    },
+    "@google-cloud/profiler": {
+      "version": "0.2.3",
+      "from": "@google-cloud/profiler@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-0.2.3.tgz",
+      "dependencies": {
+        "@google-cloud/common": {
+          "version": "0.26.2",
+          "from": "@google-cloud/common@>=0.26.0 <0.27.0",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.26.2.tgz"
+        },
+        "through2": {
+          "version": "3.0.0",
+          "from": "through2@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.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"
+    },
+    "@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"
+    },
+    "@google-cloud/trace-agent": {
+      "version": "3.5.0",
+      "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"
+        },
+        "methods": {
+          "version": "1.1.2",
+          "from": "methods@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "from": "uuid@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
+        }
+      }
+    },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "from": "@protobufjs/aspromise@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "from": "@protobufjs/base64@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "from": "@protobufjs/codegen@>=2.0.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "from": "@protobufjs/eventemitter@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "from": "@protobufjs/fetch@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "from": "@protobufjs/float@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "from": "@protobufjs/inquire@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "from": "@protobufjs/path@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "from": "@protobufjs/pool@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "from": "@protobufjs/utf8@>=1.1.0 <2.0.0",
+      "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"
+    },
+    "@sinonjs/commons": {
+      "version": "1.3.0",
+      "from": "@sinonjs/commons@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz"
+    },
+    "@sinonjs/formatio": {
+      "version": "3.1.0",
+      "from": "@sinonjs/formatio@>=3.1.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.1.0.tgz"
+    },
+    "@sinonjs/samsam": {
+      "version": "3.0.2",
+      "from": "@sinonjs/samsam@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.0.2.tgz"
+    },
+    "@types/caseless": {
+      "version": "0.12.1",
+      "from": "@types/caseless@*",
+      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"
+    },
+    "@types/console-log-level": {
+      "version": "1.4.0",
+      "from": "@types/console-log-level@>=1.4.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/console-log-level/-/console-log-level-1.4.0.tgz"
+    },
+    "@types/duplexify": {
+      "version": "3.6.0",
+      "from": "@types/duplexify@>=3.5.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.0.tgz"
+    },
+    "@types/form-data": {
+      "version": "2.2.1",
+      "from": "@types/form-data@*",
+      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"
+    },
+    "@types/long": {
+      "version": "4.0.0",
+      "from": "@types/long@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz"
+    },
+    "@types/node": {
+      "version": "10.12.18",
+      "from": "@types/node@*",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz"
+    },
+    "@types/request": {
+      "version": "2.48.1",
+      "from": "@types/request@>=2.47.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz"
+    },
+    "@types/semver": {
+      "version": "5.5.0",
+      "from": "@types/semver@>=5.5.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz"
+    },
+    "@types/tough-cookie": {
+      "version": "2.3.4",
+      "from": "@types/tough-cookie@*",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.4.tgz"
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "from": "abbrev@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.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"
+    },
+    "agent-base": {
+      "version": "4.2.1",
+      "from": "agent-base@>=4.1.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"
+    },
+    "ajv": {
+      "version": "6.6.2",
+      "from": "ajv@>=6.5.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz"
+    },
+    "ansi-regex": {
+      "version": "0.2.1",
+      "from": "ansi-regex@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+    },
+    "ansi-styles": {
+      "version": "1.1.0",
+      "from": "ansi-styles@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+    },
+    "argparse": {
+      "version": "0.1.16",
+      "from": "argparse@>=0.1.11 <0.2.0",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+      "dependencies": {
+        "underscore": {
+          "version": "1.7.0",
+          "from": "underscore@>=1.7.0 <1.8.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+        },
+        "underscore.string": {
+          "version": "2.4.0",
+          "from": "underscore.string@>=2.4.0 <2.5.0",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
+        }
+      }
+    },
+    "array-from": {
+      "version": "2.1.1",
+      "from": "array-from@>=2.1.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.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"
+    },
+    "asn1": {
+      "version": "0.1.11",
+      "from": "asn1@0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+    },
+    "assert-plus": {
+      "version": "0.1.5",
+      "from": "assert-plus@>=0.1.5 <0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "from": "assertion-error@^1.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"
+    },
+    "async": {
+      "version": "2.6.1",
+      "from": "async@>=2.5.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz"
+    },
+    "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"
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "from": "asynckit@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+    },
+    "aws-sign": {
+      "version": "0.3.0",
+      "from": "aws-sign@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "from": "aws-sign2@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "from": "aws4@>=1.8.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"
+    },
+    "axios": {
+      "version": "0.18.0",
+      "from": "axios@>=0.18.0 <0.19.0",
+      "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz"
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "from": "balanced-match@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+    },
+    "bignumber.js": {
+      "version": "7.2.1",
+      "from": "bignumber.js@>=7.0.0 <8.0.0",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"
+    },
+    "bindings": {
+      "version": "1.3.1",
+      "from": "bindings@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz"
+    },
+    "bintrees": {
+      "version": "1.0.1",
+      "from": "bintrees@1.0.1",
+      "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"
+    },
+    "bluebird": {
+      "version": "3.5.3",
+      "from": "bluebird@>=3.3.4 <4.0.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz"
+    },
+    "boom": {
+      "version": "0.4.2",
+      "from": "boom@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "from": "brace-expansion@>=1.1.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "from": "browser-stdout@1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "dev": true
+    },
+    "buffer-crc32": {
+      "version": "0.2.1",
+      "from": "buffer-crc32@0.2.1",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "from": "buffer-equal-constant-time@1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
+    },
+    "builtin-modules": {
+      "version": "3.0.0",
+      "from": "builtin-modules@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz"
+    },
+    "bunyan": {
+      "version": "0.22.3",
+      "from": "bunyan@>=0.22.1 <0.23.0",
+      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-0.22.3.tgz",
+      "dev": true
+    },
+    "buster-core": {
+      "version": "0.6.4",
+      "from": "buster-core@0.6.4",
+      "resolved": "https://registry.npmjs.org/buster-core/-/buster-core-0.6.4.tgz"
+    },
+    "buster-format": {
+      "version": "0.5.6",
+      "from": "buster-format@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/buster-format/-/buster-format-0.5.6.tgz"
+    },
+    "bytes": {
+      "version": "0.2.0",
+      "from": "bytes@0.2.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "from": "caseless@>=0.12.0 <0.13.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
+    },
+    "chai": {
+      "version": "3.5.0",
+      "from": "chai@>=3.5.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "type-detect": {
+          "version": "1.0.0",
+          "from": "type-detect@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
+          "dev": true
+        }
+      }
+    },
+    "chai-spies": {
+      "version": "0.7.1",
+      "from": "chai-spies@>=0.7.1 <0.8.0",
+      "resolved": "https://registry.npmjs.org/chai-spies/-/chai-spies-0.7.1.tgz",
+      "dev": true
+    },
+    "chalk": {
+      "version": "0.5.1",
+      "from": "chalk@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "from": "check-error@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
+    },
+    "cluster-key-slot": {
+      "version": "1.0.12",
+      "from": "cluster-key-slot@>=1.0.6 <2.0.0",
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.12.tgz"
+    },
+    "coffee-script": {
+      "version": "1.7.1",
+      "from": "coffee-script@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz"
+    },
+    "colors": {
+      "version": "0.6.2",
+      "from": "colors@>=0.6.2 <0.7.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
+    },
+    "combined-stream": {
+      "version": "0.0.7",
+      "from": "combined-stream@>=0.0.4 <0.1.0",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"
+    },
+    "commander": {
+      "version": "1.2.0",
+      "from": "commander@1.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-1.2.0.tgz"
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "from": "concat-map@0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+    },
+    "connect": {
+      "version": "2.8.4",
+      "from": "connect@2.8.4",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-2.8.4.tgz"
+    },
+    "console-log-level": {
+      "version": "1.4.0",
+      "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"
+    },
+    "continuation-local-storage": {
+      "version": "3.2.1",
+      "from": "continuation-local-storage@>=3.2.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz"
+    },
+    "cookie": {
+      "version": "0.1.0",
+      "from": "cookie@0.1.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"
+    },
+    "cookie-jar": {
+      "version": "0.3.0",
+      "from": "cookie-jar@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
+    },
+    "cookie-signature": {
+      "version": "1.0.1",
+      "from": "cookie-signature@1.0.1",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "from": "core-util-is@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+    },
+    "cryptiles": {
+      "version": "0.2.2",
+      "from": "cryptiles@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "from": "ctype@0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "from": "dashdash@>=1.12.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "dateformat": {
+      "version": "1.0.2-1.2.3",
+      "from": "dateformat@1.0.2-1.2.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
+    },
+    "debug": {
+      "version": "4.1.1",
+      "from": "debug@*",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"
+    },
+    "deep-eql": {
+      "version": "0.1.3",
+      "from": "deep-eql@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+      "dev": true,
+      "dependencies": {
+        "type-detect": {
+          "version": "0.1.1",
+          "from": "type-detect@0.1.1",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
+          "dev": true
+        }
+      }
+    },
+    "delay": {
+      "version": "4.1.0",
+      "from": "delay@>=4.0.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-4.1.0.tgz"
+    },
+    "delayed-stream": {
+      "version": "0.0.5",
+      "from": "delayed-stream@0.0.5",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+    },
+    "denque": {
+      "version": "1.4.0",
+      "from": "denque@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.0.tgz"
+    },
+    "diff": {
+      "version": "3.5.0",
+      "from": "diff@3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
+    },
+    "dtrace-provider": {
+      "version": "0.2.8",
+      "from": "dtrace-provider@0.2.8",
+      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz",
+      "dev": true,
+      "optional": true
+    },
+    "duplexify": {
+      "version": "3.6.1",
+      "from": "duplexify@>=3.6.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz"
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+      "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"
+    },
+    "emitter-listener": {
+      "version": "1.1.2",
+      "from": "emitter-listener@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz"
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "from": "end-of-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"
+    },
+    "ent": {
+      "version": "2.2.0",
+      "from": "ent@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
+    },
+    "es6-promise": {
+      "version": "4.2.5",
+      "from": "es6-promise@>=4.0.3 <5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz"
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "from": "es6-promisify@>=5.0.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+    },
+    "esprima": {
+      "version": "1.0.4",
+      "from": "esprima@>=1.0.2 <1.1.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
+    },
+    "eventemitter2": {
+      "version": "0.4.14",
+      "from": "eventemitter2@>=0.4.13 <0.5.0",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
+    },
+    "exit": {
+      "version": "0.1.2",
+      "from": "exit@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+    },
+    "express": {
+      "version": "3.3.4",
+      "from": "express@3.3.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-3.3.4.tgz"
+    },
+    "extend": {
+      "version": "3.0.2",
+      "from": "extend@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "from": "extsprintf@1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "from": "fast-deep-equal@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "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"
+    },
+    "findit2": {
+      "version": "2.2.3",
+      "from": "findit2@>=2.2.3 <3.0.0",
+      "resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz"
+    },
+    "findup-sync": {
+      "version": "0.1.3",
+      "from": "findup-sync@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "3.2.11",
+          "from": "glob@>=3.2.9 <3.3.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        },
+        "minimatch": {
+          "version": "0.3.0",
+          "from": "minimatch@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
+        }
+      }
+    },
+    "flexbuffer": {
+      "version": "0.0.6",
+      "from": "flexbuffer@0.0.6",
+      "resolved": "https://registry.npmjs.org/flexbuffer/-/flexbuffer-0.0.6.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",
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "from": "debug@3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"
+        },
+        "ms": {
+          "version": "2.0.0",
+          "from": "ms@2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+        }
+      }
+    },
+    "forever-agent": {
+      "version": "0.5.2",
+      "from": "forever-agent@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "from": "form-data@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "from": "async@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+        }
+      }
+    },
+    "formidable": {
+      "version": "1.0.14",
+      "from": "formidable@1.0.14",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"
+    },
+    "fresh": {
+      "version": "0.1.0",
+      "from": "fresh@0.1.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"
+    },
+    "fs-extra": {
+      "version": "0.9.1",
+      "from": "fs-extra@>=0.9.1 <0.10.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.9.1.tgz",
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+        },
+        "ncp": {
+          "version": "0.5.1",
+          "from": "ncp@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz"
+        }
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "from": "fs.realpath@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "dev": true
+    },
+    "gaxios": {
+      "version": "1.0.6",
+      "from": "gaxios@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.0.6.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"
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "from": "get-func-name@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"
+    },
+    "getobject": {
+      "version": "0.1.0",
+      "from": "getobject@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "from": "getpass@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "glob": {
+      "version": "6.0.4",
+      "from": "glob@>=6.0.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.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"
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "from": "lru-cache@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
+        }
+      }
+    },
+    "google-p12-pem": {
+      "version": "1.0.3",
+      "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"
+    },
+    "graceful-fs": {
+      "version": "1.2.3",
+      "from": "graceful-fs@>=1.2.0 <1.3.0",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+    },
+    "growl": {
+      "version": "1.10.5",
+      "from": "growl@1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "dev": true
+    },
+    "grunt": {
+      "version": "0.4.5",
+      "from": "grunt@>=0.4.5 <0.5.0",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.1.22",
+          "from": "async@>=0.1.22 <0.2.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+        },
+        "coffee-script": {
+          "version": "1.3.3",
+          "from": "coffee-script@>=1.3.3 <1.4.0",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
+        },
+        "glob": {
+          "version": "3.1.21",
+          "from": "glob@>=3.1.21 <3.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"
+        },
+        "inherits": {
+          "version": "1.0.2",
+          "from": "inherits@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+        },
+        "lodash": {
+          "version": "0.9.2",
+          "from": "lodash@>=0.9.2 <0.10.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "from": "minimatch@>=0.2.12 <0.3.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "from": "rimraf@>=2.2.8 <2.3.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+        }
+      }
+    },
+    "grunt-bunyan": {
+      "version": "0.5.0",
+      "from": "grunt-bunyan@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/grunt-bunyan/-/grunt-bunyan-0.5.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        }
+      }
+    },
+    "grunt-contrib-clean": {
+      "version": "0.6.0",
+      "from": "grunt-contrib-clean@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.6.0.tgz",
+      "dependencies": {
+        "rimraf": {
+          "version": "2.2.8",
+          "from": "rimraf@>=2.2.1 <2.3.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+        }
+      }
+    },
+    "grunt-contrib-coffee": {
+      "version": "0.11.1",
+      "from": "grunt-contrib-coffee@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        }
+      }
+    },
+    "grunt-execute": {
+      "version": "0.2.2",
+      "from": "grunt-execute@>=0.2.2 <0.3.0",
+      "resolved": "https://registry.npmjs.org/grunt-execute/-/grunt-execute-0.2.2.tgz"
+    },
+    "grunt-legacy-log": {
+      "version": "0.1.3",
+      "from": "grunt-legacy-log@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        },
+        "underscore.string": {
+          "version": "2.3.3",
+          "from": "underscore.string@>=2.3.3 <2.4.0",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
+        }
+      }
+    },
+    "grunt-legacy-log-utils": {
+      "version": "0.1.1",
+      "from": "grunt-legacy-log-utils@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        },
+        "underscore.string": {
+          "version": "2.3.3",
+          "from": "underscore.string@>=2.3.3 <2.4.0",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
+        }
+      }
+    },
+    "grunt-legacy-util": {
+      "version": "0.2.0",
+      "from": "grunt-legacy-util@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.1.22",
+          "from": "async@>=0.1.22 <0.2.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+        },
+        "lodash": {
+          "version": "0.9.2",
+          "from": "lodash@>=0.9.2 <0.10.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
+        }
+      }
+    },
+    "grunt-mocha-test": {
+      "version": "0.11.0",
+      "from": "grunt-mocha-test@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.11.0.tgz",
+      "dependencies": {
+        "commander": {
+          "version": "2.0.0",
+          "from": "commander@2.0.0",
+          "resolved": "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"
+        },
+        "diff": {
+          "version": "1.0.7",
+          "from": "diff@1.0.7",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz"
+        },
+        "glob": {
+          "version": "3.2.3",
+          "from": "glob@3.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz"
+        },
+        "graceful-fs": {
+          "version": "2.0.3",
+          "from": "graceful-fs@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+        },
+        "growl": {
+          "version": "1.7.0",
+          "from": "growl@>=1.7.0 <1.8.0",
+          "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz"
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "from": "minimatch@~0.2.11",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
+        },
+        "mocha": {
+          "version": "1.20.1",
+          "from": "mocha@>=1.20.0 <1.21.0",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz"
+        }
+      }
+    },
+    "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": {
+        "mime": {
+          "version": "2.4.0",
+          "from": "mime@>=2.2.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz"
+        },
+        "pify": {
+          "version": "3.0.0",
+          "from": "pify@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "from": "har-schema@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "from": "har-validator@>=5.1.0 <5.2.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"
+    },
+    "has-ansi": {
+      "version": "0.1.0",
+      "from": "has-ansi@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "from": "has-flag@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+    },
+    "hawk": {
+      "version": "1.0.0",
+      "from": "hawk@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"
+    },
+    "he": {
+      "version": "1.1.1",
+      "from": "he@1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "dev": true
+    },
+    "hex2dec": {
+      "version": "1.1.1",
+      "from": "hex2dec@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.1.tgz"
+    },
+    "hoek": {
+      "version": "0.9.1",
+      "from": "hoek@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+    },
+    "hooker": {
+      "version": "0.2.3",
+      "from": "hooker@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
+    },
+    "http-signature": {
+      "version": "0.10.1",
+      "from": "http-signature@>=0.10.0 <0.11.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"
+    },
+    "https-proxy-agent": {
+      "version": "2.2.1",
+      "from": "https-proxy-agent@>=2.2.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "from": "debug@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.2.11",
+      "from": "iconv-lite@>=0.2.11 <0.3.0",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "from": "inflight@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "from": "inherits@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+    },
+    "ioredis": {
+      "version": "3.2.2",
+      "from": "ioredis@>=3.2.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-3.2.2.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "from": "debug@>=2.6.9 <3.0.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+        },
+        "ms": {
+          "version": "2.0.0",
+          "from": "ms@2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+        }
+      }
+    },
+    "is": {
+      "version": "3.3.0",
+      "from": "is@>=3.2.0 <4.0.0",
+      "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"
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "from": "is-typedarray@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "from": "isarray@0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "from": "isstream@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+    },
+    "jade": {
+      "version": "0.26.3",
+      "from": "jade@0.26.3",
+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "from": "commander@0.6.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "from": "mkdirp@0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
+        }
+      }
+    },
+    "js-yaml": {
+      "version": "2.0.5",
+      "from": "js-yaml@>=2.0.5 <2.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "from": "jsbn@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+    },
+    "json-bigint": {
+      "version": "0.3.0",
+      "from": "json-bigint@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz"
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "from": "json-schema@0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "from": "json-schema-traverse@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "from": "json-stringify-safe@5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+    },
+    "jsonfile": {
+      "version": "1.1.1",
+      "from": "jsonfile@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz"
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "from": "jsprim@>=1.2.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "just-extend": {
+      "version": "4.0.2",
+      "from": "just-extend@>=4.0.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"
+    },
+    "jwa": {
+      "version": "1.1.6",
+      "from": "jwa@>=1.1.5 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz"
+    },
+    "jws": {
+      "version": "3.1.5",
+      "from": "jws@>=3.1.5 <4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz"
+    },
+    "keypress": {
+      "version": "0.1.0",
+      "from": "keypress@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "from": "lodash@>=4.17.10 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "from": "lodash.assign@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"
+    },
+    "lodash.bind": {
+      "version": "4.2.1",
+      "from": "lodash.bind@>=4.2.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"
+    },
+    "lodash.clone": {
+      "version": "4.5.0",
+      "from": "lodash.clone@>=4.5.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz"
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "from": "lodash.clonedeep@>=4.5.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"
+    },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "from": "lodash.defaults@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"
+    },
+    "lodash.difference": {
+      "version": "4.5.0",
+      "from": "lodash.difference@>=4.5.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"
+    },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "from": "lodash.flatten@>=4.4.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"
+    },
+    "lodash.foreach": {
+      "version": "4.5.0",
+      "from": "lodash.foreach@>=4.5.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "from": "lodash.get@>=4.4.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"
+    },
+    "lodash.isempty": {
+      "version": "4.4.0",
+      "from": "lodash.isempty@>=4.4.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"
+    },
+    "lodash.keys": {
+      "version": "4.2.0",
+      "from": "lodash.keys@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"
+    },
+    "lodash.noop": {
+      "version": "3.0.1",
+      "from": "lodash.noop@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz"
+    },
+    "lodash.partial": {
+      "version": "4.2.1",
+      "from": "lodash.partial@>=4.2.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.partial/-/lodash.partial-4.2.1.tgz"
+    },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "from": "lodash.pick@>=4.4.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"
+    },
+    "lodash.pickby": {
+      "version": "4.6.0",
+      "from": "lodash.pickby@>=4.6.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"
+    },
+    "lodash.sample": {
+      "version": "4.2.1",
+      "from": "lodash.sample@>=4.2.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz"
+    },
+    "lodash.shuffle": {
+      "version": "4.2.0",
+      "from": "lodash.shuffle@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.shuffle/-/lodash.shuffle-4.2.0.tgz"
+    },
+    "lodash.values": {
+      "version": "4.3.0",
+      "from": "lodash.values@>=4.3.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"
+    },
+    "logger-sharelatex": {
+      "version": "1.5.6",
+      "from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
+      "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#b2956ec56b582b9f4fc8fdda8dc00c06e77c5537",
+      "dependencies": {
+        "bunyan": {
+          "version": "1.5.1",
+          "from": "bunyan@1.5.1",
+          "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"
+        },
+        "chai": {
+          "version": "4.2.0",
+          "from": "chai@latest",
+          "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.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"
+        },
+        "deep-eql": {
+          "version": "3.0.1",
+          "from": "deep-eql@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.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
+        },
+        "sandboxed-module": {
+          "version": "2.0.3",
+          "from": "sandboxed-module@latest",
+          "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-2.0.3.tgz"
+        },
+        "sinon": {
+          "version": "7.2.2",
+          "from": "sinon@latest",
+          "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.2.tgz"
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "from": "supports-color@>=5.5.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+        },
+        "timekeeper": {
+          "version": "1.0.0",
+          "from": "timekeeper@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-1.0.0.tgz"
+        }
+      }
+    },
+    "lolex": {
+      "version": "3.0.0",
+      "from": "lolex@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-3.0.0.tgz"
+    },
+    "long": {
+      "version": "4.0.0",
+      "from": "long@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "from": "lru-cache@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+    },
+    "lsmod": {
+      "version": "1.0.0",
+      "from": "lsmod@1.0.0",
+      "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"
+    },
+    "lynx": {
+      "version": "0.0.11",
+      "from": "lynx@0.0.11",
+      "resolved": "https://registry.npmjs.org/lynx/-/lynx-0.0.11.tgz"
+    },
+    "mersenne": {
+      "version": "0.0.4",
+      "from": "mersenne@>=0.0.3 <0.1.0",
+      "resolved": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz"
+    },
+    "methods": {
+      "version": "0.0.1",
+      "from": "methods@0.0.1",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"
+    },
+    "metrics-sharelatex": {
+      "version": "2.0.12",
+      "from": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
+      "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#3ac1621ef049e2f2d88a83b3a41011333d609662",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.6.0",
+          "from": "coffee-script@1.6.0",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz"
+        },
+        "lynx": {
+          "version": "0.1.1",
+          "from": "lynx@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/lynx/-/lynx-0.1.1.tgz"
+        },
+        "underscore": {
+          "version": "1.6.0",
+          "from": "underscore@>=1.6.0 <1.7.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
+        }
+      }
+    },
+    "mime": {
+      "version": "1.2.11",
+      "from": "mime@>=1.2.9 <1.3.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.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"
+    },
+    "mime-types": {
+      "version": "2.1.21",
+      "from": "mime-types@>=2.1.19 <2.2.0",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "from": "minimist@0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+    },
+    "mkdirp": {
+      "version": "0.3.5",
+      "from": "mkdirp@>=0.3.5 <0.4.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+    },
+    "mocha": {
+      "version": "5.2.0",
+      "from": "mocha@>=5.0.1 <6.0.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "commander": {
+          "version": "2.15.1",
+          "from": "commander@2.15.1",
+          "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "from": "debug@3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.1.2",
+          "from": "glob@7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "from": "ms@2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "from": "supports-color@5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "dev": true
+        }
+      }
+    },
+    "module-details-from-path": {
+      "version": "1.0.3",
+      "from": "module-details-from-path@>=1.0.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz"
+    },
+    "ms": {
+      "version": "2.1.1",
+      "from": "ms@>=2.1.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"
+    },
+    "mv": {
+      "version": "2.1.1",
+      "from": "mv@~2",
+      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+      "optional": true,
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "optional": true
+        }
+      }
+    },
+    "nan": {
+      "version": "2.12.1",
+      "from": "nan@>=2.0.8 <3.0.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz"
+    },
+    "ncp": {
+      "version": "2.0.0",
+      "from": "ncp@~2.0.0",
+      "resolved": "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "optional": true
+    },
+    "nise": {
+      "version": "1.4.8",
+      "from": "nise@>=1.4.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
+      "dependencies": {
+        "lolex": {
+          "version": "2.7.5",
+          "from": "lolex@>=2.3.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"
+        }
+      }
+    },
+    "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"
+    },
+    "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"
+    },
+    "nopt": {
+      "version": "1.0.10",
+      "from": "nopt@>=1.0.10 <1.1.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
+    },
+    "oauth-sign": {
+      "version": "0.3.0",
+      "from": "oauth-sign@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+    },
+    "once": {
+      "version": "1.4.0",
+      "from": "once@>=1.3.0 <2.0.0",
+      "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"
+    },
+    "p-try": {
+      "version": "2.0.0",
+      "from": "p-try@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz"
+    },
+    "parse-duration": {
+      "version": "0.1.1",
+      "from": "parse-duration@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.1.1.tgz"
+    },
+    "parse-ms": {
+      "version": "2.0.0",
+      "from": "parse-ms@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.0.0.tgz"
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "from": "path-parse@>=1.0.6 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"
+    },
+    "path-to-regexp": {
+      "version": "1.7.0",
+      "from": "path-to-regexp@>=1.7.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "from": "pathval@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"
+    },
+    "pause": {
+      "version": "0.0.1",
+      "from": "pause@0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "from": "performance-now@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
+    },
+    "pify": {
+      "version": "4.0.1",
+      "from": "pify@>=4.0.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
+    },
+    "pretty-ms": {
+      "version": "4.0.0",
+      "from": "pretty-ms@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-4.0.0.tgz"
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "from": "process-nextick-args@>=2.0.0 <2.1.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"
+    },
+    "prom-client": {
+      "version": "11.2.1",
+      "from": "prom-client@>=11.1.3 <12.0.0",
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.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"
+    },
+    "psl": {
+      "version": "1.1.31",
+      "from": "psl@>=1.1.24 <2.0.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "from": "punycode@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+    },
+    "q": {
+      "version": "0.9.2",
+      "from": "q@0.9.2",
+      "resolved": "https://registry.npmjs.org/q/-/q-0.9.2.tgz"
+    },
+    "qs": {
+      "version": "0.6.5",
+      "from": "qs@0.6.5",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"
+    },
+    "range-parser": {
+      "version": "0.0.4",
+      "from": "range-parser@0.0.4",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.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",
+      "dependencies": {
+        "cookie": {
+          "version": "0.3.1",
+          "from": "cookie@0.3.1",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "from": "readable-stream@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        }
+      }
+    },
+    "redis": {
+      "version": "0.12.1",
+      "from": "redis@0.12.1",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
+    },
+    "redis-commands": {
+      "version": "1.4.0",
+      "from": "redis-commands@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"
+    },
+    "redis-parser": {
+      "version": "2.6.0",
+      "from": "redis-parser@>=2.4.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"
+    },
+    "redis-sentinel": {
+      "version": "0.1.1",
+      "from": "redis-sentinel@0.1.1",
+      "resolved": "https://registry.npmjs.org/redis-sentinel/-/redis-sentinel-0.1.1.tgz",
+      "dependencies": {
+        "redis": {
+          "version": "0.11.0",
+          "from": "redis@>=0.11.0 <0.12.0",
+          "resolved": "https://registry.npmjs.org/redis/-/redis-0.11.0.tgz"
+        }
+      }
+    },
+    "redis-sharelatex": {
+      "version": "1.0.4",
+      "from": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
+      "resolved": "git+https://github.com/sharelatex/redis-sharelatex.git#ca4e906559c1405d132e8edd7db763d64a57be62",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.8.0",
+          "from": "coffee-script@1.8.0",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"
+        },
+        "underscore": {
+          "version": "1.7.0",
+          "from": "underscore@1.7.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+        }
+      }
+    },
+    "request": {
+      "version": "2.25.0",
+      "from": "request@2.25.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.25.0.tgz",
+      "dependencies": {
+        "node-uuid": {
+          "version": "1.4.8",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"
+        }
+      }
+    },
+    "requestretry": {
+      "version": "1.13.0",
+      "from": "requestretry@>=1.12.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        },
+        "combined-stream": {
+          "version": "1.0.7",
+          "from": "combined-stream@>=1.0.6 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "from": "delayed-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "from": "forever-agent@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "from": "form-data@>=2.3.2 <2.4.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "from": "http-signature@>=1.2.0 <1.3.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "from": "oauth-sign@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
+        },
+        "qs": {
+          "version": "6.5.2",
+          "from": "qs@>=6.5.2 <6.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
+        },
+        "request": {
+          "version": "2.88.0",
+          "from": "request@>=2.74.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "from": "tunnel-agent@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "from": "uuid@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
+        }
+      }
+    },
+    "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"
+    },
+    "require-like": {
+      "version": "0.1.2",
+      "from": "require-like@0.1.2",
+      "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz"
+    },
+    "resolve": {
+      "version": "1.9.0",
+      "from": "resolve@>=1.5.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"
+    },
+    "retry-axios": {
+      "version": "0.3.2",
+      "from": "retry-axios@0.3.2",
+      "resolved": "https://registry.npmjs.org/retry-axios/-/retry-axios-0.3.2.tgz"
+    },
+    "retry-request": {
+      "version": "4.0.0",
+      "from": "retry-request@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.0.0.tgz"
+    },
+    "rimraf": {
+      "version": "2.4.5",
+      "from": "rimraf@>=2.4.0 <2.5.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "from": "safe-buffer@>=5.1.1 <5.2.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+    },
+    "safe-json-stringify": {
+      "version": "1.2.0",
+      "from": "safe-json-stringify@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
+      "optional": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "from": "safer-buffer@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+    },
+    "sandboxed-module": {
+      "version": "0.2.2",
+      "from": "sandboxed-module@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-0.2.2.tgz",
+      "dependencies": {
+        "stack-trace": {
+          "version": "0.0.6",
+          "from": "stack-trace@0.0.6",
+          "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz"
+        }
+      }
+    },
+    "semver": {
+      "version": "5.6.0",
+      "from": "semver@>=5.5.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"
+    },
+    "send": {
+      "version": "0.1.3",
+      "from": "send@0.1.3",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.1.3.tgz"
+    },
+    "settings-sharelatex": {
+      "version": "1.0.0",
+      "from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
+      "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.6.0",
+          "from": "coffee-script@1.6.0",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz"
+        }
+      }
+    },
+    "shimmer": {
+      "version": "1.2.0",
+      "from": "shimmer@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.0.tgz"
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "from": "sigmund@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+    },
+    "sinon": {
+      "version": "1.5.2",
+      "from": "sinon@>=1.5.2 <1.6.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.5.2.tgz"
+    },
+    "sntp": {
+      "version": "0.2.4",
+      "from": "sntp@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "from": "source-map@>=0.6.1 <0.7.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+    },
+    "split": {
+      "version": "1.0.1",
+      "from": "split@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz"
+    },
+    "sshpk": {
+      "version": "1.16.0",
+      "from": "sshpk@>=1.7.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
+      "dependencies": {
+        "asn1": {
+          "version": "0.2.4",
+          "from": "asn1@>=0.2.3 <0.3.0",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.9",
+      "from": "stack-trace@0.0.9",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+    },
+    "statsd-parser": {
+      "version": "0.0.4",
+      "from": "statsd-parser@>=0.0.4 <0.1.0",
+      "resolved": "https://registry.npmjs.org/statsd-parser/-/statsd-parser-0.0.4.tgz"
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "from": "stream-shift@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "from": "string_decoder@>=1.1.1 <1.2.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+    },
+    "strip-ansi": {
+      "version": "0.3.0",
+      "from": "strip-ansi@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"
+    },
+    "supports-color": {
+      "version": "0.2.0",
+      "from": "supports-color@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+    },
+    "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",
+      "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz"
+    },
+    "teeny-request": {
+      "version": "3.11.3",
+      "from": "teeny-request@>=3.11.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz",
+      "dependencies": {
+        "uuid": {
+          "version": "3.3.2",
+          "from": "uuid@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
+        }
+      }
+    },
+    "text-encoding": {
+      "version": "0.6.4",
+      "from": "text-encoding@>=0.6.4 <0.7.0",
+      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"
+    },
+    "through": {
+      "version": "2.3.8",
+      "from": "through@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+    },
+    "through2": {
+      "version": "2.0.5",
+      "from": "through2@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
+    },
+    "timekeeper": {
+      "version": "2.1.2",
+      "from": "timekeeper@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-2.1.2.tgz",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "from": "tough-cookie@>=2.4.3 <2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "from": "punycode@>=1.4.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.3.0",
+      "from": "tunnel-agent@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "from": "tweetnacl@>=0.14.0 <0.15.0",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "from": "type-detect@>=4.0.5 <5.0.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
+    },
+    "uid2": {
+      "version": "0.0.2",
+      "from": "uid2@0.0.2",
+      "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.2.tgz"
+    },
+    "underscore": {
+      "version": "1.2.2",
+      "from": "underscore@1.2.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.2.tgz"
+    },
+    "underscore.string": {
+      "version": "2.2.1",
+      "from": "underscore.string@>=2.2.1 <2.3.0",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "from": "uri-js@>=4.2.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "from": "util-deprecate@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+    },
+    "uuid": {
+      "version": "3.0.0",
+      "from": "uuid@3.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"
+    },
+    "verror": {
+      "version": "1.10.0",
+      "from": "verror@1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "when": {
+      "version": "3.7.8",
+      "from": "when@>=3.7.7 <4.0.0",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz"
+    },
+    "which": {
+      "version": "1.0.9",
+      "from": "which@>=1.0.5 <1.1.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz"
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "from": "wrappy@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "from": "xtend@>=4.0.1 <4.1.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+    },
+    "yallist": {
+      "version": "3.0.3",
+      "from": "yallist@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"
+    }
+  }
+}
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 006509bec7..a497ea8844 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -25,7 +25,7 @@
     "express": "3.3.4",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
     "lynx": "0.0.11",
-    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.8",
+    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
     "request": "2.25.0",
     "requestretry": "^1.12.0",

From 0aa7315c27a372b8e2b5d5c59972670dffd17da9 Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Fri, 4 Jan 2019 09:24:09 +0000
Subject: [PATCH 10/28] Bump buildscripts to 1.1.10

---
 services/document-updater/Dockerfile            | 2 +-
 services/document-updater/Makefile              | 2 +-
 services/document-updater/buildscript.txt       | 2 +-
 services/document-updater/docker-compose.ci.yml | 2 +-
 services/document-updater/docker-compose.yml    | 2 +-
 services/document-updater/package.json          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile
index aabf01ad91..59f5e61889 100644
--- a/services/document-updater/Dockerfile
+++ b/services/document-updater/Dockerfile
@@ -19,4 +19,4 @@ COPY --from=app /app /app
 WORKDIR /app
 USER node
 
-CMD ["node","app.js"]
+CMD ["node", "--expose-gc", "app.js"]
diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile
index 09b26a6055..336a84f5d6 100644
--- a/services/document-updater/Makefile
+++ b/services/document-updater/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/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt
index c9ccb323b4..a545422ca4 100644
--- a/services/document-updater/buildscript.txt
+++ b/services/document-updater/buildscript.txt
@@ -1,4 +1,4 @@
---script-version=1.1.9
+--script-version=1.1.10
 document-updater
 --node-version=6.9.5
 --acceptance-creds=None
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index 17c4ddd2bf..5ab90e1825 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/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/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index dcbc14e683..aeceafb3f3 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/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/services/document-updater/package.json b/services/document-updater/package.json
index a497ea8844..3f5b5cb126 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/sharelatex/document-updater-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 05a80c7cba67c98471c47a6030641ca9f810fea6 Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Fri, 4 Jan 2019 09:31:00 +0000
Subject: [PATCH 11/28] Add app.map to .gitignore

---
 services/document-updater/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/document-updater/.gitignore b/services/document-updater/.gitignore
index ad21f261b4..df0820fb06 100644
--- a/services/document-updater/.gitignore
+++ b/services/document-updater/.gitignore
@@ -39,6 +39,7 @@ Thumbs.db
 
 app.js
 app/js/*
+app.map
 
 test/unit/js/*
 test/acceptance/js/*

From a783c6b3cca2a292ffaadd9c089e4d285c1d053c Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Fri, 4 Jan 2019 09:33:08 +0000
Subject: [PATCH 12/28] Bump logger to 1.5.9

---
 services/document-updater/npm-shrinkwrap.json | 6 +++---
 services/document-updater/package.json        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/document-updater/npm-shrinkwrap.json b/services/document-updater/npm-shrinkwrap.json
index a9c29cbc70..83661f0574 100644
--- a/services/document-updater/npm-shrinkwrap.json
+++ b/services/document-updater/npm-shrinkwrap.json
@@ -1292,9 +1292,9 @@
       "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"
     },
     "logger-sharelatex": {
-      "version": "1.5.6",
-      "from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
-      "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#b2956ec56b582b9f4fc8fdda8dc00c06e77c5537",
+      "version": "1.5.9",
+      "from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
+      "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#e8e1b95052f62e107336053e4a983f81cdbdf589",
       "dependencies": {
         "bunyan": {
           "version": "1.5.1",
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 3f5b5cb126..d8dfc91bf8 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -23,7 +23,7 @@
     "async": "^2.5.0",
     "coffee-script": "~1.7.0",
     "express": "3.3.4",
-    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
+    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
     "lynx": "0.0.11",
     "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",

From 5db1913cec345e8b480e515e88ab7c2202bed19e Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Tue, 8 Jan 2019 15:00:26 +0000
Subject: [PATCH 13/28] Bump settings to v1.1.0

---
 services/document-updater/npm-shrinkwrap.json | 6 +++---
 services/document-updater/package.json        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/document-updater/npm-shrinkwrap.json b/services/document-updater/npm-shrinkwrap.json
index 83661f0574..7b7ef11221 100644
--- a/services/document-updater/npm-shrinkwrap.json
+++ b/services/document-updater/npm-shrinkwrap.json
@@ -1858,9 +1858,9 @@
       "resolved": "https://registry.npmjs.org/send/-/send-0.1.3.tgz"
     },
     "settings-sharelatex": {
-      "version": "1.0.0",
-      "from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
-      "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559",
+      "version": "1.1.0",
+      "from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
+      "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#93f63d029b52fef8825c3a401b2b6a7ba29b4750",
       "dependencies": {
         "coffee-script": {
           "version": "1.6.0",
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index d8dfc91bf8..0bffffdaa0 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -30,7 +30,7 @@
     "request": "2.25.0",
     "requestretry": "^1.12.0",
     "sandboxed-module": "~0.2.0",
-    "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
+    "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
     "sinon": "~1.5.2",
     "underscore": "1.2.2"
   },

From 3eb2d27d4aa99cb113cc5af5ac6c7cc682509c9c Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Tue, 8 Jan 2019 15:01:48 +0000
Subject: [PATCH 14/28] Add **/*.map to .gitignore

---
 services/document-updater/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/document-updater/.gitignore b/services/document-updater/.gitignore
index df0820fb06..dbce694d3b 100644
--- a/services/document-updater/.gitignore
+++ b/services/document-updater/.gitignore
@@ -39,7 +39,7 @@ Thumbs.db
 
 app.js
 app/js/*
-app.map
+**/*.map
 
 test/unit/js/*
 test/acceptance/js/*

From 76b054c7f4cc544a3724cfdcbfb6cfb02abed6fb Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 25 Jan 2019 16:32:26 +0000
Subject: [PATCH 15/28] bump node redis to 1.0.5

---
 services/document-updater/npm-shrinkwrap.json | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/services/document-updater/npm-shrinkwrap.json b/services/document-updater/npm-shrinkwrap.json
index 7b7ef11221..d116d14988 100644
--- a/services/document-updater/npm-shrinkwrap.json
+++ b/services/document-updater/npm-shrinkwrap.json
@@ -1698,23 +1698,7 @@
         }
       }
     },
-    "redis-sharelatex": {
-      "version": "1.0.4",
-      "from": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
-      "resolved": "git+https://github.com/sharelatex/redis-sharelatex.git#ca4e906559c1405d132e8edd7db763d64a57be62",
-      "dependencies": {
-        "coffee-script": {
-          "version": "1.8.0",
-          "from": "coffee-script@1.8.0",
-          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"
-        },
-        "underscore": {
-          "version": "1.7.0",
-          "from": "underscore@1.7.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
-        }
-      }
-    },
+    
     "request": {
       "version": "2.25.0",
       "from": "request@2.25.0",

From d279a9149c8a4a44f47afb9e8a8021207238e4dd Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 25 Jan 2019 17:24:19 +0000
Subject: [PATCH 16/28] add dispatcherCount to config file

---
 services/document-updater/config/settings.defaults.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index 7f36e47207..8074183168 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -86,5 +86,7 @@ module.exports =
 	
 	max_doc_length: 2 * 1024 * 1024 # 2mb
 
+	dispatcherCount: process.env["DISPATCHER_COUNT"]
+
 	mongo:
 		url: "mongodb://#{process.env["MONGO_HOST"] or "localhost"}/sharelatex"

From 3051d7db4b96e68dc245704e0fa7f409f7621360 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 30 Jan 2019 16:24:17 +0000
Subject: [PATCH 17/28] bulk upgrade to 1.1.12, moved to npm rather than git

---
 services/document-updater/Jenkinsfile         |   10 +-
 services/document-updater/Makefile            |    6 +-
 services/document-updater/buildscript.txt     |    5 +-
 .../document-updater/docker-compose.ci.yml    |   13 +-
 services/document-updater/docker-compose.yml  |   12 +-
 services/document-updater/npm-shrinkwrap.json | 1154 ++++++-----------
 services/document-updater/package.json        |    8 +-
 7 files changed, 420 insertions(+), 788 deletions(-)

diff --git a/services/document-updater/Jenkinsfile b/services/document-updater/Jenkinsfile
index 3af2b785b8..9ec298487b 100644
--- a/services/document-updater/Jenkinsfile
+++ b/services/document-updater/Jenkinsfile
@@ -48,8 +48,11 @@ pipeline {
       }
     }
 
-    stage('Package and publish build') {
+    stage('Package and docker push') {
       steps {
+        sh 'echo ${BUILD_NUMBER} > build_number.txt'
+        sh 'touch build.tar.gz' // Avoid tar warning about files changing during read
+        sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make tar'
         
         withCredentials([file(credentialsId: 'gcr.io_overleaf-ops', variable: 'DOCKER_REPO_KEY_PATH')]) {
           sh 'docker login -u _json_key --password-stdin https://gcr.io/overleaf-ops < ${DOCKER_REPO_KEY_PATH}'
@@ -60,9 +63,12 @@ pipeline {
       }
     }
 
-    stage('Publish build number') {
+    stage('Publish to s3') {
       steps {
         sh 'echo ${BRANCH_NAME}-${BUILD_NUMBER} > build_number.txt'
+        withAWS(credentials:'S3_CI_BUILDS_AWS_KEYS', region:"${S3_REGION_BUILD_ARTEFACTS}") {
+            s3Upload(file:'build.tar.gz', bucket:"${S3_BUCKET_BUILD_ARTEFACTS}", path:"${JOB_NAME}/${BUILD_NUMBER}.tar.gz")
+        }
         withAWS(credentials:'S3_CI_BUILDS_AWS_KEYS', region:"${S3_REGION_BUILD_ARTEFACTS}") {
             // The deployment process uses this file to figure out the latest build
             s3Upload(file:'build_number.txt', bucket:"${S3_BUCKET_BUILD_ARTEFACTS}", path:"${JOB_NAME}/latest")
diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile
index 336a84f5d6..07216e7800 100644
--- a/services/document-updater/Makefile
+++ b/services/document-updater/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.12
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -13,7 +13,6 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	MOCHA_GREP=${MOCHA_GREP} \
 	docker-compose ${DOCKER_COMPOSE_FLAGS}
 
-
 clean:
 	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
@@ -40,6 +39,9 @@ build:
 		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		.
 
+tar:
+	$(DOCKER_COMPOSE) up tar
+
 publish:
 
 	docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt
index a545422ca4..aa39cdc02f 100644
--- a/services/document-updater/buildscript.txt
+++ b/services/document-updater/buildscript.txt
@@ -1,9 +1,8 @@
---script-version=1.1.10
 document-updater
+--language=coffeescript
 --node-version=6.9.5
 --acceptance-creds=None
---language=coffeescript
 --dependencies=mongo,redis
 --docker-repos=gcr.io/overleaf-ops
---kube=false
 --build-target=docker
+--script-version=1.1.12
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index 5ab90e1825..36b52f8f8b 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/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.12
 
 version: "2"
 
@@ -11,6 +11,7 @@ services:
     user: node
     command: npm run test:unit:_run
 
+
   test_acceptance:
     build: .
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
@@ -26,6 +27,16 @@ services:
     user: node
     command: npm run test:acceptance:_run
 
+
+
+  tar:
+    build: .
+    image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
+    volumes:
+      - ./:/tmp/build/
+    command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
+    user: root
+
   redis:
     image: redis
 
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index aeceafb3f3..8bb7857cb6 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/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.12
 
 version: "2"
 
@@ -33,6 +33,16 @@ services:
       - redis
     command: npm run test:acceptance
 
+
+
+  tar:
+    build: .
+    image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
+    volumes:
+      - ./:/tmp/build/
+    command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
+    user: root
+
   redis:
     image: redis
 
diff --git a/services/document-updater/npm-shrinkwrap.json b/services/document-updater/npm-shrinkwrap.json
index d116d14988..26742b3c9b 100644
--- a/services/document-updater/npm-shrinkwrap.json
+++ b/services/document-updater/npm-shrinkwrap.json
@@ -38,7 +38,7 @@
     },
     "@google-cloud/projectify": {
       "version": "0.3.2",
-      "from": "@google-cloud/projectify@>=0.3.2 <0.4.0",
+      "from": "@google-cloud/projectify@>=0.3.0 <0.4.0",
       "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.2.tgz"
     },
     "@google-cloud/promisify": {
@@ -47,14 +47,19 @@
       "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
     },
     "@google-cloud/trace-agent": {
-      "version": "3.5.0",
+      "version": "3.5.2",
       "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",
+      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.2.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"
+          "version": "0.30.2",
+          "from": "@google-cloud/common@>=0.30.0 <0.31.0",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.30.2.tgz"
+        },
+        "google-auth-library": {
+          "version": "3.0.1",
+          "from": "google-auth-library@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.0.1.tgz"
         },
         "methods": {
           "version": "1.1.2",
@@ -63,7 +68,7 @@
         },
         "uuid": {
           "version": "3.3.2",
-          "from": "uuid@>=3.0.1 <4.0.0",
+          "from": "uuid@^3.0.1",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
         }
       }
@@ -123,21 +128,6 @@
       "from": "@sindresorhus/is@>=0.13.0 <0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.13.0.tgz"
     },
-    "@sinonjs/commons": {
-      "version": "1.3.0",
-      "from": "@sinonjs/commons@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz"
-    },
-    "@sinonjs/formatio": {
-      "version": "3.1.0",
-      "from": "@sinonjs/formatio@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.1.0.tgz"
-    },
-    "@sinonjs/samsam": {
-      "version": "3.0.2",
-      "from": "@sinonjs/samsam@>=3.0.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.0.2.tgz"
-    },
     "@types/caseless": {
       "version": "0.12.1",
       "from": "@types/caseless@*",
@@ -164,9 +154,9 @@
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz"
     },
     "@types/node": {
-      "version": "10.12.18",
+      "version": "10.12.20",
       "from": "@types/node@*",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz"
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.20.tgz"
     },
     "@types/request": {
       "version": "2.48.1",
@@ -179,14 +169,9 @@
       "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"
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "from": "abbrev@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz"
     },
     "acorn": {
       "version": "5.7.3",
@@ -199,41 +184,9 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"
     },
     "ajv": {
-      "version": "6.6.2",
-      "from": "ajv@>=6.5.5 <7.0.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz"
-    },
-    "ansi-regex": {
-      "version": "0.2.1",
-      "from": "ansi-regex@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-    },
-    "ansi-styles": {
-      "version": "1.1.0",
-      "from": "ansi-styles@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
-    },
-    "argparse": {
-      "version": "0.1.16",
-      "from": "argparse@>=0.1.11 <0.2.0",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
-      "dependencies": {
-        "underscore": {
-          "version": "1.7.0",
-          "from": "underscore@>=1.7.0 <1.8.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
-        },
-        "underscore.string": {
-          "version": "2.4.0",
-          "from": "underscore.string@>=2.4.0 <2.5.0",
-          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
-        }
-      }
-    },
-    "array-from": {
-      "version": "2.1.1",
-      "from": "array-from@>=2.1.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"
+      "version": "5.5.2",
+      "from": "ajv@>=5.1.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"
     },
     "arrify": {
       "version": "1.0.1",
@@ -253,12 +206,13 @@
     "assertion-error": {
       "version": "1.1.0",
       "from": "assertion-error@^1.0.1",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "dev": true
     },
     "async": {
-      "version": "2.6.1",
+      "version": "2.6.0",
       "from": "async@>=2.5.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz"
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz"
     },
     "async-listener": {
       "version": "0.6.10",
@@ -281,9 +235,9 @@
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
     },
     "aws4": {
-      "version": "1.8.0",
-      "from": "aws4@>=1.8.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"
+      "version": "1.6.0",
+      "from": "aws4@>=1.6.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"
     },
     "axios": {
       "version": "0.18.0",
@@ -292,13 +246,19 @@
     },
     "balanced-match": {
       "version": "1.0.0",
-      "from": "balanced-match@>=1.0.0 <2.0.0",
+      "from": "balanced-match@^1.0.0",
       "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",
+      "version": "1.0.1",
       "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "optional": true
     },
     "bignumber.js": {
       "version": "7.2.1",
@@ -306,29 +266,24 @@
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"
     },
     "bindings": {
-      "version": "1.3.1",
+      "version": "1.4.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.4.0.tgz"
     },
     "bintrees": {
       "version": "1.0.1",
       "from": "bintrees@1.0.1",
       "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"
     },
-    "bluebird": {
-      "version": "3.5.3",
-      "from": "bluebird@>=3.3.4 <4.0.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz"
-    },
     "boom": {
       "version": "0.4.2",
       "from": "boom@>=0.4.0 <0.5.0",
       "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
     },
     "brace-expansion": {
-      "version": "1.1.11",
-      "from": "brace-expansion@>=1.1.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+      "version": "1.1.8",
+      "from": "brace-expansion@^1.1.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
     },
     "browser-stdout": {
       "version": "1.3.1",
@@ -397,31 +352,21 @@
       "resolved": "https://registry.npmjs.org/chai-spies/-/chai-spies-0.7.1.tgz",
       "dev": true
     },
-    "chalk": {
-      "version": "0.5.1",
-      "from": "chalk@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"
-    },
-    "check-error": {
-      "version": "1.0.2",
-      "from": "check-error@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
-    },
     "cluster-key-slot": {
-      "version": "1.0.12",
+      "version": "1.0.8",
       "from": "cluster-key-slot@>=1.0.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.12.tgz"
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz"
+    },
+    "co": {
+      "version": "4.6.0",
+      "from": "co@>=4.6.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
     },
     "coffee-script": {
       "version": "1.7.1",
       "from": "coffee-script@>=1.7.0 <1.8.0",
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz"
     },
-    "colors": {
-      "version": "0.6.2",
-      "from": "colors@>=0.6.2 <0.7.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
-    },
     "combined-stream": {
       "version": "0.0.7",
       "from": "combined-stream@>=0.0.4 <0.1.0",
@@ -469,7 +414,7 @@
     },
     "core-util-is": {
       "version": "1.0.2",
-      "from": "core-util-is@>=1.0.0 <1.1.0",
+      "from": "core-util-is@1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
     },
     "cryptiles": {
@@ -494,15 +439,10 @@
         }
       }
     },
-    "dateformat": {
-      "version": "1.0.2-1.2.3",
-      "from": "dateformat@1.0.2-1.2.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
-    },
     "debug": {
-      "version": "4.1.1",
+      "version": "3.1.0",
       "from": "debug@*",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"
     },
     "deep-eql": {
       "version": "0.1.3",
@@ -536,7 +476,8 @@
     "diff": {
       "version": "3.5.0",
       "from": "diff@3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "dev": true
     },
     "dtrace-provider": {
       "version": "0.2.8",
@@ -551,9 +492,10 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz"
     },
     "ecc-jsbn": {
-      "version": "0.1.2",
+      "version": "0.1.1",
       "from": "ecc-jsbn@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "optional": true
     },
     "ecdsa-sig-formatter": {
       "version": "1.0.10",
@@ -587,23 +529,9 @@
     },
     "escape-string-regexp": {
       "version": "1.0.5",
-      "from": "escape-string-regexp@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-    },
-    "esprima": {
-      "version": "1.0.4",
-      "from": "esprima@>=1.0.2 <1.1.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
-    },
-    "eventemitter2": {
-      "version": "0.4.14",
-      "from": "eventemitter2@>=0.4.13 <0.5.0",
-      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
-    },
-    "exit": {
-      "version": "0.1.2",
-      "from": "exit@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+      "from": "escape-string-regexp@^1.0.2",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "dev": true
     },
     "express": {
       "version": "3.3.4",
@@ -611,9 +539,9 @@
       "resolved": "https://registry.npmjs.org/express/-/express-3.3.4.tgz"
     },
     "extend": {
-      "version": "3.0.2",
-      "from": "extend@>=3.0.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+      "version": "3.0.1",
+      "from": "extend@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"
     },
     "extsprintf": {
       "version": "1.3.0",
@@ -621,42 +549,30 @@
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "from": "fast-deep-equal@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"
+      "version": "1.0.0",
+      "from": "fast-deep-equal@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "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"
     },
-    "findup-sync": {
-      "version": "0.1.3",
-      "from": "findup-sync@>=0.1.2 <0.2.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "3.2.11",
-          "from": "glob@>=3.2.9 <3.3.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
-        },
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "minimatch": {
-          "version": "0.3.0",
-          "from": "minimatch@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
-        }
-      }
-    },
     "flexbuffer": {
       "version": "0.0.6",
       "from": "flexbuffer@0.0.6",
@@ -665,19 +581,7 @@
     "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",
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "from": "debug@3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"
-        },
-        "ms": {
-          "version": "2.0.0",
-          "from": "ms@2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz"
     },
     "forever-agent": {
       "version": "0.5.2",
@@ -706,23 +610,6 @@
       "from": "fresh@0.1.0",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"
     },
-    "fs-extra": {
-      "version": "0.9.1",
-      "from": "fs-extra@>=0.9.1 <0.10.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.9.1.tgz",
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.1",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-        },
-        "ncp": {
-          "version": "0.5.1",
-          "from": "ncp@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz"
-        }
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "from": "fs.realpath@>=1.0.0 <2.0.0",
@@ -730,25 +617,22 @@
       "dev": true
     },
     "gaxios": {
-      "version": "1.0.6",
-      "from": "gaxios@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.0.6.tgz"
+      "version": "1.2.7",
+      "from": "gaxios@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.2.7.tgz",
+      "dependencies": {
+        "extend": {
+          "version": "3.0.2",
+          "from": "extend@>=3.0.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.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"
     },
-    "get-func-name": {
-      "version": "2.0.0",
-      "from": "get-func-name@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"
-    },
-    "getobject": {
-      "version": "0.1.0",
-      "from": "getobject@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
-    },
     "getpass": {
       "version": "0.1.7",
       "from": "getpass@>=0.1.1 <0.2.0",
@@ -763,8 +647,9 @@
     },
     "glob": {
       "version": "6.0.4",
-      "from": "glob@>=6.0.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
+      "from": "glob@^6.0.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+      "optional": true
     },
     "google-auth-library": {
       "version": "2.0.2",
@@ -775,11 +660,6 @@
           "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"
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "from": "lru-cache@>=5.0.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
         }
       }
     },
@@ -788,207 +668,15 @@
       "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"
     },
-    "graceful-fs": {
-      "version": "1.2.3",
-      "from": "graceful-fs@>=1.2.0 <1.3.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-    },
-    "growl": {
-      "version": "1.10.5",
-      "from": "growl@1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "dev": true
-    },
-    "grunt": {
-      "version": "0.4.5",
-      "from": "grunt@>=0.4.5 <0.5.0",
-      "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
-      "dependencies": {
-        "async": {
-          "version": "0.1.22",
-          "from": "async@>=0.1.22 <0.2.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-        },
-        "coffee-script": {
-          "version": "1.3.3",
-          "from": "coffee-script@>=1.3.3 <1.4.0",
-          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
-        },
-        "glob": {
-          "version": "3.1.21",
-          "from": "glob@>=3.1.21 <3.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"
-        },
-        "inherits": {
-          "version": "1.0.2",
-          "from": "inherits@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-        },
-        "lodash": {
-          "version": "0.9.2",
-          "from": "lodash@>=0.9.2 <0.10.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "from": "minimatch@>=0.2.12 <0.3.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "from": "rimraf@>=2.2.8 <2.3.0",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-        }
-      }
-    },
-    "grunt-bunyan": {
-      "version": "0.5.0",
-      "from": "grunt-bunyan@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/grunt-bunyan/-/grunt-bunyan-0.5.0.tgz",
-      "dependencies": {
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        }
-      }
-    },
-    "grunt-contrib-clean": {
-      "version": "0.6.0",
-      "from": "grunt-contrib-clean@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.6.0.tgz",
-      "dependencies": {
-        "rimraf": {
-          "version": "2.2.8",
-          "from": "rimraf@>=2.2.1 <2.3.0",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-        }
-      }
-    },
-    "grunt-contrib-coffee": {
-      "version": "0.11.1",
-      "from": "grunt-contrib-coffee@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz",
-      "dependencies": {
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        }
-      }
-    },
-    "grunt-execute": {
-      "version": "0.2.2",
-      "from": "grunt-execute@>=0.2.2 <0.3.0",
-      "resolved": "https://registry.npmjs.org/grunt-execute/-/grunt-execute-0.2.2.tgz"
-    },
-    "grunt-legacy-log": {
-      "version": "0.1.3",
-      "from": "grunt-legacy-log@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
-      "dependencies": {
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "underscore.string": {
-          "version": "2.3.3",
-          "from": "underscore.string@>=2.3.3 <2.4.0",
-          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
-        }
-      }
-    },
-    "grunt-legacy-log-utils": {
-      "version": "0.1.1",
-      "from": "grunt-legacy-log-utils@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz",
-      "dependencies": {
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "underscore.string": {
-          "version": "2.3.3",
-          "from": "underscore.string@>=2.3.3 <2.4.0",
-          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
-        }
-      }
-    },
-    "grunt-legacy-util": {
-      "version": "0.2.0",
-      "from": "grunt-legacy-util@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
-      "dependencies": {
-        "async": {
-          "version": "0.1.22",
-          "from": "async@>=0.1.22 <0.2.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-        },
-        "lodash": {
-          "version": "0.9.2",
-          "from": "lodash@>=0.9.2 <0.10.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
-        }
-      }
-    },
-    "grunt-mocha-test": {
-      "version": "0.11.0",
-      "from": "grunt-mocha-test@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.11.0.tgz",
-      "dependencies": {
-        "commander": {
-          "version": "2.0.0",
-          "from": "commander@2.0.0",
-          "resolved": "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"
-        },
-        "diff": {
-          "version": "1.0.7",
-          "from": "diff@1.0.7",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz"
-        },
-        "glob": {
-          "version": "3.2.3",
-          "from": "glob@3.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz"
-        },
-        "graceful-fs": {
-          "version": "2.0.3",
-          "from": "graceful-fs@>=2.0.0 <2.1.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
-        },
-        "growl": {
-          "version": "1.7.0",
-          "from": "growl@>=1.7.0 <1.8.0",
-          "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz"
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "from": "minimatch@~0.2.11",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
-        },
-        "mocha": {
-          "version": "1.20.1",
-          "from": "mocha@>=1.20.0 <1.21.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz"
-        }
-      }
-    },
     "gtoken": {
-      "version": "2.3.0",
+      "version": "2.3.2",
       "from": "gtoken@>=2.3.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.2.tgz",
       "dependencies": {
         "mime": {
           "version": "2.4.0",
           "from": "mime@>=2.2.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz"
-        },
-        "pify": {
-          "version": "3.0.0",
-          "from": "pify@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
         }
       }
     },
@@ -998,19 +686,9 @@
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"
     },
     "har-validator": {
-      "version": "5.1.3",
-      "from": "har-validator@>=5.1.0 <5.2.0",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"
-    },
-    "has-ansi": {
-      "version": "0.1.0",
-      "from": "has-ansi@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "from": "has-flag@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+      "version": "5.0.3",
+      "from": "har-validator@>=5.0.3 <5.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"
     },
     "hawk": {
       "version": "1.0.0",
@@ -1024,20 +702,15 @@
       "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"
     },
     "hoek": {
       "version": "0.9.1",
       "from": "hoek@>=0.9.0 <0.10.0",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
     },
-    "hooker": {
-      "version": "0.2.3",
-      "from": "hooker@>=0.2.3 <0.3.0",
-      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
-    },
     "http-signature": {
       "version": "0.10.1",
       "from": "http-signature@>=0.10.0 <0.11.0",
@@ -1046,23 +719,11 @@
     "https-proxy-agent": {
       "version": "2.2.1",
       "from": "https-proxy-agent@>=2.2.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "from": "debug@>=3.1.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
-        }
-      }
-    },
-    "iconv-lite": {
-      "version": "0.2.11",
-      "from": "iconv-lite@>=0.2.11 <0.3.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"
     },
     "inflight": {
       "version": "1.0.6",
-      "from": "inflight@>=1.0.4 <2.0.0",
+      "from": "inflight@^1.0.4",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
     },
     "inherits": {
@@ -1071,21 +732,9 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
     },
     "ioredis": {
-      "version": "3.2.2",
-      "from": "ioredis@>=3.2.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-3.2.2.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "from": "debug@>=2.6.9 <3.0.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
-        },
-        "ms": {
-          "version": "2.0.0",
-          "from": "ms@2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-        }
-      }
+      "version": "4.6.0",
+      "from": "ioredis@4.6.0",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.6.0.tgz"
     },
     "is": {
       "version": "3.3.0",
@@ -1103,41 +752,20 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
     },
     "isarray": {
-      "version": "0.0.1",
-      "from": "isarray@0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+      "version": "1.0.0",
+      "from": "isarray@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
     },
     "isstream": {
       "version": "0.1.2",
       "from": "isstream@>=0.1.2 <0.2.0",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
     },
-    "jade": {
-      "version": "0.26.3",
-      "from": "jade@0.26.3",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-      "dependencies": {
-        "commander": {
-          "version": "0.6.1",
-          "from": "commander@0.6.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
-        },
-        "mkdirp": {
-          "version": "0.3.0",
-          "from": "mkdirp@0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
-        }
-      }
-    },
-    "js-yaml": {
-      "version": "2.0.5",
-      "from": "js-yaml@>=2.0.5 <2.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"
-    },
     "jsbn": {
       "version": "0.1.1",
       "from": "jsbn@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "optional": true
     },
     "json-bigint": {
       "version": "0.3.0",
@@ -1150,20 +778,15 @@
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
     },
     "json-schema-traverse": {
-      "version": "0.4.1",
-      "from": "json-schema-traverse@>=0.4.1 <0.5.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+      "version": "0.3.1",
+      "from": "json-schema-traverse@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "from": "json-stringify-safe@5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
     },
-    "jsonfile": {
-      "version": "1.1.1",
-      "from": "jsonfile@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz"
-    },
     "jsprim": {
       "version": "1.4.1",
       "from": "jsprim@>=1.2.2 <2.0.0",
@@ -1176,20 +799,15 @@
         }
       }
     },
-    "just-extend": {
-      "version": "4.0.2",
-      "from": "just-extend@>=4.0.2 <5.0.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"
-    },
     "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.2.0",
+      "from": "jwa@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"
     },
     "jws": {
-      "version": "3.1.5",
+      "version": "3.2.1",
       "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.1.tgz"
     },
     "keypress": {
       "version": "0.1.0",
@@ -1197,124 +815,64 @@
       "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"
     },
     "lodash": {
-      "version": "4.17.11",
-      "from": "lodash@>=4.17.10 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "from": "lodash.assign@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"
-    },
-    "lodash.bind": {
-      "version": "4.2.1",
-      "from": "lodash.bind@>=4.2.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"
-    },
-    "lodash.clone": {
-      "version": "4.5.0",
-      "from": "lodash.clone@>=4.5.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz"
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "from": "lodash.clonedeep@>=4.5.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"
+      "version": "4.17.4",
+      "from": "lodash@>=4.14.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
     },
     "lodash.defaults": {
       "version": "4.2.0",
       "from": "lodash.defaults@>=4.2.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"
     },
-    "lodash.difference": {
-      "version": "4.5.0",
-      "from": "lodash.difference@>=4.5.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"
-    },
     "lodash.flatten": {
       "version": "4.4.0",
       "from": "lodash.flatten@>=4.4.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"
     },
-    "lodash.foreach": {
-      "version": "4.5.0",
-      "from": "lodash.foreach@>=4.5.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "from": "lodash.get@>=4.4.2 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "from": "lodash.isempty@>=4.4.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"
-    },
-    "lodash.keys": {
-      "version": "4.2.0",
-      "from": "lodash.keys@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"
-    },
-    "lodash.noop": {
-      "version": "3.0.1",
-      "from": "lodash.noop@>=3.0.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz"
-    },
-    "lodash.partial": {
-      "version": "4.2.1",
-      "from": "lodash.partial@>=4.2.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.partial/-/lodash.partial-4.2.1.tgz"
-    },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "from": "lodash.pick@>=4.4.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"
-    },
     "lodash.pickby": {
       "version": "4.6.0",
       "from": "lodash.pickby@>=4.6.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"
     },
-    "lodash.sample": {
-      "version": "4.2.1",
-      "from": "lodash.sample@>=4.2.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz"
-    },
-    "lodash.shuffle": {
-      "version": "4.2.0",
-      "from": "lodash.shuffle@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.shuffle/-/lodash.shuffle-4.2.0.tgz"
-    },
-    "lodash.values": {
-      "version": "4.3.0",
-      "from": "lodash.values@>=4.3.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"
-    },
     "logger-sharelatex": {
-      "version": "1.5.9",
-      "from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
-      "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#e8e1b95052f62e107336053e4a983f81cdbdf589",
+      "version": "1.6.0",
+      "from": "logger-sharelatex@1.6.0",
+      "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.6.0.tgz",
       "dependencies": {
+        "ajv": {
+          "version": "6.7.0",
+          "from": "ajv@>=6.5.5 <7.0.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "from": "aws4@>=1.8.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"
+        },
         "bunyan": {
           "version": "1.5.1",
           "from": "bunyan@1.5.1",
           "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"
         },
-        "chai": {
-          "version": "4.2.0",
-          "from": "chai@latest",
-          "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.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"
         },
-        "deep-eql": {
-          "version": "3.0.1",
-          "from": "deep-eql@>=3.0.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"
+        "combined-stream": {
+          "version": "1.0.7",
+          "from": "combined-stream@>=1.0.6 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "from": "delayed-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
         },
         "dtrace-provider": {
           "version": "0.6.0",
@@ -1322,42 +880,97 @@
           "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz",
           "optional": true
         },
-        "sandboxed-module": {
-          "version": "2.0.3",
-          "from": "sandboxed-module@latest",
-          "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-2.0.3.tgz"
+        "extend": {
+          "version": "3.0.2",
+          "from": "extend@>=3.0.2 <3.1.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
         },
-        "sinon": {
-          "version": "7.2.2",
-          "from": "sinon@latest",
-          "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.2.tgz"
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "from": "fast-deep-equal@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"
         },
-        "supports-color": {
-          "version": "5.5.0",
-          "from": "supports-color@>=5.5.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+        "forever-agent": {
+          "version": "0.6.1",
+          "from": "forever-agent@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
         },
-        "timekeeper": {
-          "version": "1.0.0",
-          "from": "timekeeper@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-1.0.0.tgz"
+        "form-data": {
+          "version": "2.3.3",
+          "from": "form-data@>=2.3.2 <2.4.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
+        },
+        "har-validator": {
+          "version": "5.1.3",
+          "from": "har-validator@>=5.1.0 <5.2.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "from": "http-signature@>=1.2.0 <1.3.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "from": "json-schema-traverse@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.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"
+        },
+        "mime-types": {
+          "version": "2.1.21",
+          "from": "mime-types@>=2.1.19 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "from": "oauth-sign@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
+        },
+        "qs": {
+          "version": "6.5.2",
+          "from": "qs@>=6.5.2 <6.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
+        },
+        "request": {
+          "version": "2.88.0",
+          "from": "request@>=2.88.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz"
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "from": "safe-buffer@>=5.1.2 <6.0.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "from": "tough-cookie@>=2.4.3 <2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "from": "tunnel-agent@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "from": "uuid@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
         }
       }
     },
-    "lolex": {
-      "version": "3.0.0",
-      "from": "lolex@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-3.0.0.tgz"
-    },
     "long": {
       "version": "4.0.0",
       "from": "long@>=4.0.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
     },
     "lru-cache": {
-      "version": "2.7.3",
-      "from": "lru-cache@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+      "version": "5.1.1",
+      "from": "lru-cache@>=5.0.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
     },
     "lsmod": {
       "version": "1.0.0",
@@ -1380,9 +993,9 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"
     },
     "metrics-sharelatex": {
-      "version": "2.0.12",
-      "from": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
-      "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#3ac1621ef049e2f2d88a83b3a41011333d609662",
+      "version": "2.1.1",
+      "from": "metrics-sharelatex@2.1.1",
+      "resolved": "https://registry.npmjs.org/metrics-sharelatex/-/metrics-sharelatex-2.1.1.tgz",
       "dependencies": {
         "coffee-script": {
           "version": "1.6.0",
@@ -1407,18 +1020,18 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.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.30.0",
+      "from": "mime-db@>=1.30.0 <1.31.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"
     },
     "mime-types": {
-      "version": "2.1.21",
-      "from": "mime-types@>=2.1.19 <2.2.0",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"
+      "version": "2.1.17",
+      "from": "mime-types@>=2.1.17 <2.2.0",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"
     },
     "minimatch": {
       "version": "3.0.4",
-      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+      "from": "minimatch@2 || 3",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
     },
     "minimist": {
@@ -1440,13 +1053,7 @@
         "commander": {
           "version": "2.15.1",
           "from": "commander@2.15.1",
-          "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "from": "debug@3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
           "dev": true
         },
         "glob": {
@@ -1455,18 +1062,24 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
           "dev": true
         },
+        "growl": {
+          "version": "1.10.5",
+          "from": "growl@1.10.5",
+          "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "from": "has-flag@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "dev": true
+        },
         "mkdirp": {
           "version": "0.5.1",
           "from": "mkdirp@0.5.1",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "dev": true
         },
-        "ms": {
-          "version": "2.0.0",
-          "from": "ms@2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "dev": true
-        },
         "supports-color": {
           "version": "5.4.0",
           "from": "supports-color@5.4.0",
@@ -1481,9 +1094,9 @@
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz"
     },
     "ms": {
-      "version": "2.1.1",
-      "from": "ms@>=2.1.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"
+      "version": "2.0.0",
+      "from": "ms@2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
     },
     "mv": {
       "version": "2.1.1",
@@ -1507,21 +1120,9 @@
     "ncp": {
       "version": "2.0.0",
       "from": "ncp@~2.0.0",
-      "resolved": "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "optional": true
     },
-    "nise": {
-      "version": "1.4.8",
-      "from": "nise@>=1.4.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
-      "dependencies": {
-        "lolex": {
-          "version": "2.7.5",
-          "from": "lolex@>=2.3.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"
-        }
-      }
-    },
     "node-fetch": {
       "version": "2.3.0",
       "from": "node-fetch@>=2.2.0 <3.0.0",
@@ -1529,14 +1130,9 @@
     },
     "node-forge": {
       "version": "0.7.6",
-      "from": "node-forge@>=0.7.5 <0.8.0",
+      "from": "node-forge@>=0.7.4 <0.8.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"
     },
-    "nopt": {
-      "version": "1.0.10",
-      "from": "nopt@>=1.0.10 <1.1.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
-    },
     "oauth-sign": {
       "version": "0.3.0",
       "from": "oauth-sign@>=0.3.0 <0.4.0",
@@ -1544,7 +1140,7 @@
     },
     "once": {
       "version": "1.4.0",
-      "from": "once@>=1.3.0 <2.0.0",
+      "from": "once@^1.3.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
     },
     "p-limit": {
@@ -1569,24 +1165,14 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+      "from": "path-is-absolute@^1.0.0",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
     },
     "path-parse": {
       "version": "1.0.6",
-      "from": "path-parse@>=1.0.6 <2.0.0",
+      "from": "path-parse@>=1.0.5 <2.0.0",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"
     },
-    "path-to-regexp": {
-      "version": "1.7.0",
-      "from": "path-to-regexp@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"
-    },
-    "pathval": {
-      "version": "1.1.0",
-      "from": "pathval@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"
-    },
     "pause": {
       "version": "0.0.1",
       "from": "pause@0.0.1",
@@ -1599,7 +1185,7 @@
     },
     "pify": {
       "version": "4.0.1",
-      "from": "pify@>=4.0.1 <5.0.0",
+      "from": "pify@>=4.0.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
     },
     "pretty-ms": {
@@ -1628,9 +1214,9 @@
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"
     },
     "punycode": {
-      "version": "2.1.1",
-      "from": "punycode@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+      "version": "1.4.1",
+      "from": "punycode@>=1.4.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
     },
     "q": {
       "version": "0.9.2",
@@ -1662,14 +1248,7 @@
     "readable-stream": {
       "version": "2.3.6",
       "from": "readable-stream@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "from": "isarray@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"
     },
     "redis": {
       "version": "0.12.1",
@@ -1678,13 +1257,18 @@
     },
     "redis-commands": {
       "version": "1.4.0",
-      "from": "redis-commands@>=1.2.0 <2.0.0",
+      "from": "redis-commands@1.4.0",
       "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"
     },
+    "redis-errors": {
+      "version": "1.2.0",
+      "from": "redis-errors@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"
+    },
     "redis-parser": {
-      "version": "2.6.0",
-      "from": "redis-parser@>=2.4.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"
+      "version": "3.0.0",
+      "from": "redis-parser@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"
     },
     "redis-sentinel": {
       "version": "0.1.1",
@@ -1698,7 +1282,23 @@
         }
       }
     },
-    
+    "redis-sharelatex": {
+      "version": "1.0.5",
+      "from": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.5.tgz",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.8.0",
+          "from": "coffee-script@1.8.0",
+          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"
+        },
+        "underscore": {
+          "version": "1.7.0",
+          "from": "underscore@1.7.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+        }
+      }
+    },
     "request": {
       "version": "2.25.0",
       "from": "request@2.25.0",
@@ -1712,19 +1312,36 @@
       }
     },
     "requestretry": {
-      "version": "1.13.0",
+      "version": "1.12.2",
       "from": "requestretry@>=1.12.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.12.2.tgz",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "from": "assert-plus@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
         },
+        "boom": {
+          "version": "4.3.1",
+          "from": "boom@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"
+        },
         "combined-stream": {
-          "version": "1.0.7",
-          "from": "combined-stream@>=1.0.6 <1.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"
+          "version": "1.0.5",
+          "from": "combined-stream@>=1.0.5 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+        },
+        "cryptiles": {
+          "version": "3.1.2",
+          "from": "cryptiles@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "dependencies": {
+            "boom": {
+              "version": "5.2.0",
+              "from": "boom@>=5.0.0 <6.0.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"
+            }
+          }
         },
         "delayed-stream": {
           "version": "1.0.0",
@@ -1737,9 +1354,19 @@
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
         },
         "form-data": {
-          "version": "2.3.3",
-          "from": "form-data@>=2.3.2 <2.4.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
+          "version": "2.3.1",
+          "from": "form-data@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz"
+        },
+        "hawk": {
+          "version": "6.0.2",
+          "from": "hawk@>=6.0.2 <6.1.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"
+        },
+        "hoek": {
+          "version": "4.2.0",
+          "from": "hoek@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"
         },
         "http-signature": {
           "version": "1.2.0",
@@ -1747,19 +1374,24 @@
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
         },
         "oauth-sign": {
-          "version": "0.9.0",
-          "from": "oauth-sign@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
+          "version": "0.8.2",
+          "from": "oauth-sign@>=0.8.2 <0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
         },
         "qs": {
-          "version": "6.5.2",
-          "from": "qs@>=6.5.2 <6.6.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
+          "version": "6.5.1",
+          "from": "qs@>=6.5.1 <6.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"
         },
         "request": {
-          "version": "2.88.0",
+          "version": "2.83.0",
           "from": "request@>=2.74.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz"
+          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz"
+        },
+        "sntp": {
+          "version": "2.1.0",
+          "from": "sntp@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"
         },
         "tunnel-agent": {
           "version": "0.6.0",
@@ -1767,9 +1399,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
         },
         "uuid": {
-          "version": "3.3.2",
-          "from": "uuid@>=3.3.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
+          "version": "3.1.0",
+          "from": "uuid@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
         }
       }
     },
@@ -1784,13 +1416,13 @@
       "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz"
     },
     "resolve": {
-      "version": "1.9.0",
+      "version": "1.10.0",
       "from": "resolve@>=1.5.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"
     },
     "retry-axios": {
       "version": "0.3.2",
-      "from": "retry-axios@0.3.2",
+      "from": "retry-axios@>=0.3.2 <0.4.0",
       "resolved": "https://registry.npmjs.org/retry-axios/-/retry-axios-0.3.2.tgz"
     },
     "retry-request": {
@@ -1800,13 +1432,14 @@
     },
     "rimraf": {
       "version": "2.4.5",
-      "from": "rimraf@>=2.4.0 <2.5.0",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"
+      "from": "rimraf@~2.4.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+      "optional": true
     },
     "safe-buffer": {
-      "version": "5.1.2",
-      "from": "safe-buffer@>=5.1.1 <5.2.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+      "version": "5.1.1",
+      "from": "safe-buffer@>=5.1.1 <6.0.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
     },
     "safe-json-stringify": {
       "version": "1.2.0",
@@ -1814,11 +1447,6 @@
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "optional": true
     },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "from": "safer-buffer@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
-    },
     "sandboxed-module": {
       "version": "0.2.2",
       "from": "sandboxed-module@>=0.2.0 <0.3.0",
@@ -1843,8 +1471,8 @@
     },
     "settings-sharelatex": {
       "version": "1.1.0",
-      "from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
-      "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#93f63d029b52fef8825c3a401b2b6a7ba29b4750",
+      "from": "settings-sharelatex@1.1.0",
+      "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.1.0.tgz",
       "dependencies": {
         "coffee-script": {
           "version": "1.6.0",
@@ -1854,14 +1482,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"
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "from": "sigmund@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz"
     },
     "sinon": {
       "version": "1.5.2",
@@ -1884,14 +1507,14 @@
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz"
     },
     "sshpk": {
-      "version": "1.16.0",
+      "version": "1.13.1",
       "from": "sshpk@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "dependencies": {
         "asn1": {
-          "version": "0.2.4",
+          "version": "0.2.3",
           "from": "asn1@>=0.2.3 <0.3.0",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
         },
         "assert-plus": {
           "version": "1.0.0",
@@ -1905,6 +1528,11 @@
       "from": "stack-trace@0.0.9",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
     },
+    "standard-as-callback": {
+      "version": "1.0.1",
+      "from": "standard-as-callback@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-1.0.1.tgz"
+    },
     "statsd-parser": {
       "version": "0.0.4",
       "from": "statsd-parser@>=0.0.4 <0.1.0",
@@ -1920,15 +1548,10 @@
       "from": "string_decoder@>=1.1.1 <1.2.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
     },
-    "strip-ansi": {
-      "version": "0.3.0",
-      "from": "strip-ansi@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"
-    },
-    "supports-color": {
-      "version": "0.2.0",
-      "from": "supports-color@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+    "stringstream": {
+      "version": "0.0.5",
+      "from": "stringstream@>=0.0.5 <0.1.0",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
     },
     "symbol-observable": {
       "version": "1.2.0",
@@ -1942,7 +1565,7 @@
     },
     "teeny-request": {
       "version": "3.11.3",
-      "from": "teeny-request@>=3.11.1 <4.0.0",
+      "from": "teeny-request@>=3.6.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz",
       "dependencies": {
         "uuid": {
@@ -1952,11 +1575,6 @@
         }
       }
     },
-    "text-encoding": {
-      "version": "0.6.4",
-      "from": "text-encoding@>=0.6.4 <0.7.0",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"
-    },
     "through": {
       "version": "2.3.8",
       "from": "through@>=2.0.0 <3.0.0",
@@ -1964,26 +1582,19 @@
     },
     "through2": {
       "version": "2.0.5",
-      "from": "through2@>=2.0.0 <3.0.0",
+      "from": "through2@>=2.0.3 <3.0.0",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
     },
     "timekeeper": {
-      "version": "2.1.2",
+      "version": "2.0.0",
       "from": "timekeeper@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-2.0.0.tgz",
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "from": "tough-cookie@>=2.4.3 <2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "from": "punycode@>=1.4.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-        }
-      }
+      "version": "2.3.3",
+      "from": "tough-cookie@>=2.3.3 <2.4.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"
     },
     "tunnel-agent": {
       "version": "0.3.0",
@@ -1993,12 +1604,8 @@
     "tweetnacl": {
       "version": "0.14.5",
       "from": "tweetnacl@>=0.14.0 <0.15.0",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "from": "type-detect@>=4.0.5 <5.0.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "optional": true
     },
     "uid2": {
       "version": "0.0.2",
@@ -2010,15 +1617,17 @@
       "from": "underscore@1.2.2",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.2.tgz"
     },
-    "underscore.string": {
-      "version": "2.2.1",
-      "from": "underscore.string@>=2.2.1 <2.3.0",
-      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
-    },
     "uri-js": {
       "version": "4.2.2",
       "from": "uri-js@>=4.2.2 <5.0.0",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "from": "punycode@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+        }
+      }
     },
     "util-deprecate": {
       "version": "1.0.2",
@@ -2047,14 +1656,9 @@
       "from": "when@>=3.7.7 <4.0.0",
       "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz"
     },
-    "which": {
-      "version": "1.0.9",
-      "from": "which@>=1.0.5 <1.1.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz"
-    },
     "wrappy": {
       "version": "1.0.2",
-      "from": "wrappy@>=1.0.0 <2.0.0",
+      "from": "wrappy@1",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
     },
     "xtend": {
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 0bffffdaa0..fa95246d21 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -23,14 +23,14 @@
     "async": "^2.5.0",
     "coffee-script": "~1.7.0",
     "express": "3.3.4",
-    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
+    "logger-sharelatex": "^1.6.0",
     "lynx": "0.0.11",
-    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
-    "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
+    "metrics-sharelatex": "^2.1.1",
+    "redis-sharelatex": "^1.0.5",
     "request": "2.25.0",
     "requestretry": "^1.12.0",
     "sandboxed-module": "~0.2.0",
-    "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
+    "settings-sharelatex": "^1.1.0",
     "sinon": "~1.5.2",
     "underscore": "1.2.2"
   },

From 98de529e42cf1d2cdf621caa37267b6e3f4f3d01 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 1 Feb 2019 19:40:20 +0000
Subject: [PATCH 18/28] make config look like chef config

---
 .../config/settings.defaults.coffee           | 95 +++++++++----------
 services/document-updater/package.json        |  2 +-
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index 8074183168..cd3a736cf2 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -20,69 +20,64 @@ module.exports =
 			url: "http://#{process.env["PROJECT_HISTORY_HOST"] or "localhost"}:3054"
 
 	redis:
-		documentupdater:
-			port: process.env["DOC_UPDATER_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
-			host: process.env["DOC_UPDATER_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
-			password: process.env["DOC_UPDATER_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
-			key_schema:
-				blockingKey: ({doc_id}) -> "Blocking:#{doc_id}"
-				docLines: ({doc_id}) -> "doclines:#{doc_id}"
-				docOps: ({doc_id}) -> "DocOps:#{doc_id}"
-				docVersion: ({doc_id}) -> "DocVersion:#{doc_id}"
-				docHash: ({doc_id}) -> "DocHash:#{doc_id}"
-				projectKey: ({doc_id}) -> "ProjectId:#{doc_id}"
-				docsInProject: ({project_id}) -> "DocsIn:#{project_id}"
-				ranges: ({doc_id}) -> "Ranges:#{doc_id}"
-				pathname: ({doc_id}) -> "Pathname:#{doc_id}"
-				projectHistoryId: ({doc_id}) -> "ProjectHistoryId:#{doc_id}"
-				projectState: ({project_id}) -> "ProjectState:#{project_id}"
-				unflushedTime: ({doc_id}) -> "UnflushedTime:#{doc_id}"
-				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
-			# cluster: [{
-			# 	port: "7000"
-			# 	host: "localhost"
-			# }]
-			# key_schema:
-			# 	blockingKey: ({doc_id}) -> "Blocking:{#{doc_id}}"
-			# 	docLines: ({doc_id}) -> "doclines:{#{doc_id}}"
-			# 	docOps: ({doc_id}) -> "DocOps:{#{doc_id}}"
-			# 	docVersion: ({doc_id}) -> "DocVersion:{#{doc_id}}"
-			# 	docHash: ({doc_id}) -> "DocHash:{#{doc_id}}"
-			# 	projectKey: ({doc_id}) -> "ProjectId:{#{doc_id}}"
-			# 	docsInProject: ({project_id}) -> "DocsIn:{#{project_id}}"
-			# 	ranges: ({doc_id}) -> "Ranges:{#{doc_id}}"
-			# 	projectState: ({project_id}) -> "ProjectState:{#{project_id}}"
+		realtime:
+			port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
+			redisOptions:
+				keepAlive: 100
+
 		history:
 			port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
 			host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
 			password: process.env["HISTORY_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
-				uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:#{doc_id}"
-				docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:#{project_id}"
+				uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:{#{doc_id}}"
+				docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}"
+			redisOptions:
+				keepAlive: 100
 
 		project_history:
+			port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["HISTORY_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
-				projectHistoryOps: ({project_id}) -> "ProjectHistory:Ops:#{project_id}"
-				projectHistoryFirstOpTimestamp: ({project_id}) -> "ProjectHistory:FirstOpTimestamp:#{project_id}"
-			# cluster: [{
-			# 	port: "7000"
-			# 	host: "localhost"
-			# }]
-			# key_schema:
-			# 	uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:{#{doc_id}}"
-			# 	docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}"
+				projectHistoryOps: ({project_id}) -> "ProjectHistory:Ops:{#{project_id}}"
+				projectHistoryFirstOpTimestamp: ({project_id}) -> "ProjectHistory:FirstOpTimestamp:{#{project_id}}"
+			redisOptions:
+				keepAlive: 100
+
 		lock:
 			port: process.env["LOCK_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
 			host: process.env["LOCK_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
 			password: process.env["LOCK_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
 			key_schema:
-				blockingKey: ({doc_id}) -> "Blocking:#{doc_id}"
-			# cluster: [{
-			# 	port: "7000"
-			# 	host: "localhost"
-			# }]
-			# key_schema:
-			# 	blockingKey: ({doc_id}) -> "Blocking:{#{doc_id}}"
+				blockingKey: ({doc_id}) -> "Blocking:{#{doc_id}}"
+			redisOptions:
+				keepAlive: 100
+
+		documentupdater:
+			port: process.env["DOC_UPDATER_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
+			host: process.env["DOC_UPDATER_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
+			password: process.env["DOC_UPDATER_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
+			redisOptions:
+				keepAlive: 100
+			key_schema:
+				blockingKey: ({doc_id}) -> "Blocking:{#{doc_id}}"
+				docLines: ({doc_id}) -> "doclines:{#{doc_id}}"
+				docOps: ({doc_id}) -> "DocOps:{#{doc_id}}"
+				docVersion: ({doc_id}) -> "DocVersion:{#{doc_id}}"
+				docHash: ({doc_id}) -> "DocHash:{#{doc_id}}"
+				projectKey: ({doc_id}) -> "ProjectId:{#{doc_id}}"
+				docsInProject: ({project_id}) -> "DocsIn:{#{project_id}}"
+				ranges: ({doc_id}) -> "Ranges:{#{doc_id}}"
+				unflushedTime: ({doc_id}) -> "UnflushedTime:{#{doc_id}}"
+				pathname: ({doc_id}) -> "Pathname:{#{doc_id}}"
+				projectHistoryId: ({doc_id}) -> "ProjectHistoryId:{#{doc_id}}"
+				projectState: ({project_id}) -> "ProjectState:{#{project_id}}"
+				pendingUpdates: ({doc_id}) -> "PendingUpdates:{#{doc_id}}"
+			redisOptions:
+				keepAlive: 100
 	
 	max_doc_length: 2 * 1024 * 1024 # 2mb
 
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index fa95246d21..5ab28811b8 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -26,7 +26,7 @@
     "logger-sharelatex": "^1.6.0",
     "lynx": "0.0.11",
     "metrics-sharelatex": "^2.1.1",
-    "redis-sharelatex": "^1.0.5",
+    "redis-sharelatex": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.5.tgz",
     "request": "2.25.0",
     "requestretry": "^1.12.0",
     "sandboxed-module": "~0.2.0",

From e44a02391a7025f48c04dc22b67a97e8760112f5 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 1 Feb 2019 20:04:43 +0000
Subject: [PATCH 19/28] standardise name of document-updater

---
 services/document-updater/app.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index cbcaf23897..a22a552d59 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -1,11 +1,11 @@
 Metrics = require "metrics-sharelatex"
-Metrics.initialize("doc-updater")
+Metrics.initialize("document-updater")
 
 express = require('express')
 http = require("http")
 Settings = require('settings-sharelatex')
 logger = require('logger-sharelatex')
-logger.initialize("documentupdater")
+logger.initialize("document-updater")
 logger.logger.serializers.docs = require("./app/js/LoggerSerializers").docs
 logger.logger.serializers.files = require("./app/js/LoggerSerializers").files
 if Settings.sentry?.dsn?

From 8d3fb729c552c81b5696dff6729504070b8645ac Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 1 Feb 2019 20:10:47 +0000
Subject: [PATCH 20/28] point to web_api

---
 services/document-updater/config/settings.defaults.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index cd3a736cf2..20d0a53549 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -10,7 +10,7 @@ module.exports =
 
 	apis:
 		web:
-			url: "http://#{process.env["WEB_HOST"] or "localhost"}:#{process.env['WEB_PORT'] or 3000}"
+			url: "http://#{process.env['WEB_API_HOST'] or process.env['WEB_HOST'] or "localhost"}:#{process.env['WEB_API_PORT'] or process.env['WEB_PORT'] or 3000}"
 			user: "sharelatex"
 			pass: "password"
 		trackchanges:

From 4e1a2c787cbdb0b3c01e31daefb9d96392bceefe Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 6 Feb 2019 15:29:22 +0000
Subject: [PATCH 21/28] Revert "turn down logging, use logger.info for less
 important data"

This reverts commit c5f91428e3c7702fbbd3ffd1ef7a772d513f33f2.
---
 .../app/coffee/DocumentManager.coffee             |  2 +-
 .../app/coffee/HistoryRedisManager.coffee         |  2 +-
 .../app/coffee/HttpController.coffee              |  8 ++++----
 .../app/coffee/RangesManager.coffee               |  6 +++---
 .../app/coffee/RedisManager.coffee                |  2 +-
 .../app/coffee/ShareJsUpdateManager.coffee        |  4 ++--
 .../app/coffee/UpdateManager.coffee               |  2 +-
 .../DocumentManager/DocumentManagerTests.coffee   |  2 +-
 .../HistoryRedisManagerTests.coffee               |  4 +---
 .../HttpController/HttpControllerTests.coffee     |  8 ++++----
 .../RangesManager/RangesManagerTests.coffee       | 15 +++++----------
 .../coffee/RedisManager/RedisManagerTests.coffee  |  2 +-
 .../ShareJsUpdateManagerTests.coffee              |  2 +-
 .../UpdateManager/UpdateManagerTests.coffee       |  2 +-
 14 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/services/document-updater/app/coffee/DocumentManager.coffee b/services/document-updater/app/coffee/DocumentManager.coffee
index 7b8caa3e20..39713a1981 100644
--- a/services/document-updater/app/coffee/DocumentManager.coffee
+++ b/services/document-updater/app/coffee/DocumentManager.coffee
@@ -25,7 +25,7 @@ module.exports = DocumentManager =
 				logger.log {project_id, doc_id}, "doc not in redis so getting from persistence API"
 				PersistenceManager.getDoc project_id, doc_id, (error, lines, version, ranges, pathname, projectHistoryId) ->
 					return callback(error) if error?
-					logger.info {project_id, doc_id, lines, version, pathname, projectHistoryId}, "got doc from persistence API"
+					logger.log {project_id, doc_id, lines, version, pathname, projectHistoryId}, "got doc from persistence API"
 					RedisManager.putDocInMemory project_id, doc_id, lines, version, ranges, pathname, projectHistoryId, (error) ->
 						return callback(error) if error?
 						callback null, lines, version, ranges, pathname, projectHistoryId, null, false
diff --git a/services/document-updater/app/coffee/HistoryRedisManager.coffee b/services/document-updater/app/coffee/HistoryRedisManager.coffee
index 8c37132ada..d9a99a09aa 100644
--- a/services/document-updater/app/coffee/HistoryRedisManager.coffee
+++ b/services/document-updater/app/coffee/HistoryRedisManager.coffee
@@ -7,7 +7,7 @@ module.exports = HistoryRedisManager =
 	recordDocHasHistoryOps: (project_id, doc_id, ops = [], callback = (error) ->) ->
 		if ops.length == 0
 			return callback(new Error("cannot push no ops")) # This should never be called with no ops, but protect against a redis error if we sent an empty array to rpush
-		logger.info project_id: project_id, doc_id: doc_id, "marking doc in project for history ops"
+		logger.log project_id: project_id, doc_id: doc_id, "marking doc in project for history ops"
 		rclient.sadd Keys.docsWithHistoryOps({project_id}), doc_id, (error) ->
 			return callback(error) if error?
 			callback()
diff --git a/services/document-updater/app/coffee/HttpController.coffee b/services/document-updater/app/coffee/HttpController.coffee
index 6cf03f2cd6..93f915d662 100644
--- a/services/document-updater/app/coffee/HttpController.coffee
+++ b/services/document-updater/app/coffee/HttpController.coffee
@@ -11,7 +11,7 @@ module.exports = HttpController =
 	getDoc: (req, res, next = (error) ->) ->
 		doc_id = req.params.doc_id
 		project_id = req.params.project_id
-		logger.info project_id: project_id, doc_id: doc_id, "getting doc via http"
+		logger.log project_id: project_id, doc_id: doc_id, "getting doc via http"
 		timer = new Metrics.Timer("http.getDoc")
 
 		if req.query?.fromVersion?
@@ -22,7 +22,7 @@ module.exports = HttpController =
 		DocumentManager.getDocAndRecentOpsWithLock project_id, doc_id, fromVersion, (error, lines, version, ops, ranges, pathname) ->
 			timer.done()
 			return next(error) if error?
-			logger.info project_id: project_id, doc_id: doc_id, "got doc via http"
+			logger.log project_id: project_id, doc_id: doc_id, "got doc via http"
 			if !lines? or !version?
 				return next(new Errors.NotFoundError("document not found"))
 			res.send JSON.stringify
@@ -44,13 +44,13 @@ module.exports = HttpController =
 		projectStateHash = req.query?.state
 		# exclude is string of existing docs "id:version,id:version,..."
 		excludeItems = req.query?.exclude?.split(',') or []
-		logger.info project_id: project_id, exclude: excludeItems, "getting docs via http"
+		logger.log project_id: project_id, exclude: excludeItems, "getting docs via http"
 		timer = new Metrics.Timer("http.getAllDocs")
 		excludeVersions = {}
 		for item in excludeItems
 			[id,version] = item?.split(':')
 			excludeVersions[id] = version
-		logger.info {project_id: project_id, projectStateHash: projectStateHash, excludeVersions: excludeVersions}, "excluding versions"
+		logger.log {project_id: project_id, projectStateHash: projectStateHash, excludeVersions: excludeVersions}, "excluding versions"
 		ProjectManager.getProjectDocsAndFlushIfOld project_id, projectStateHash, excludeVersions, (error, result) ->
 			timer.done()
 			if error instanceof Errors.ProjectStateChangedError
diff --git a/services/document-updater/app/coffee/RangesManager.coffee b/services/document-updater/app/coffee/RangesManager.coffee
index ce3fa5dfca..d0653bb6a2 100644
--- a/services/document-updater/app/coffee/RangesManager.coffee
+++ b/services/document-updater/app/coffee/RangesManager.coffee
@@ -30,12 +30,12 @@ module.exports = RangesManager =
 			return callback(error)
 
 		response = RangesManager._getRanges rangesTracker
-		logger.info {project_id, doc_id, changesCount: response.changes?.length, commentsCount: response.comments?.length}, "applied updates to ranges"
+		logger.log {project_id, doc_id, changesCount: response.changes?.length, commentsCount: response.comments?.length}, "applied updates to ranges"
 		callback null, response
 
 	acceptChanges: (change_ids, ranges, callback = (error, ranges) ->) ->
 		{changes, comments} = ranges
-		logger.info "accepting #{ change_ids.length } changes in ranges"
+		logger.log "accepting #{ change_ids.length } changes in ranges"
 		rangesTracker = new RangesTracker(changes, comments)
 		rangesTracker.removeChangeIds(change_ids)
 		response = RangesManager._getRanges(rangesTracker)
@@ -43,7 +43,7 @@ module.exports = RangesManager =
 
 	deleteComment: (comment_id, ranges, callback = (error, ranges) ->) ->
 		{changes, comments} = ranges
-		logger.info {comment_id}, "deleting comment in ranges"
+		logger.log {comment_id}, "deleting comment in ranges"
 		rangesTracker = new RangesTracker(changes, comments)
 		rangesTracker.removeCommentId(comment_id)
 		response = RangesManager._getRanges(rangesTracker)
diff --git a/services/document-updater/app/coffee/RedisManager.coffee b/services/document-updater/app/coffee/RedisManager.coffee
index 064c6144af..25dbafc6e7 100644
--- a/services/document-updater/app/coffee/RedisManager.coffee
+++ b/services/document-updater/app/coffee/RedisManager.coffee
@@ -233,7 +233,7 @@ module.exports = RedisManager =
 			newHash = RedisManager._computeHash(newDocLines)
 
 			opVersions = appliedOps.map (op) -> op?.v
-			logger.info doc_id: doc_id, version: newVersion, hash: newHash, op_versions: opVersions, "updating doc in redis"
+			logger.log doc_id: doc_id, version: newVersion, hash: newHash, op_versions: opVersions, "updating doc in redis"
 
 			RedisManager._serializeRanges ranges, (error, ranges) ->
 				if error?
diff --git a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee
index 7a79b82724..a5cc6070cb 100644
--- a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee
+++ b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee
@@ -20,7 +20,7 @@ module.exports = ShareJsUpdateManager =
 		return model
 
 	applyUpdate: (project_id, doc_id, update, lines, version, callback = (error, updatedDocLines) ->) ->
-		logger.info project_id: project_id, doc_id: doc_id, update: update, "applying sharejs updates"
+		logger.log project_id: project_id, doc_id: doc_id, update: update, "applying sharejs updates"
 		jobs = []
 
 		# We could use a global model for all docs, but we're hitting issues with the
@@ -39,7 +39,7 @@ module.exports = ShareJsUpdateManager =
 					ShareJsUpdateManager._sendOp(project_id, doc_id, update)
 				else
 					return callback(error)
-			logger.info project_id: project_id, doc_id: doc_id, error: error, "applied update"
+			logger.log project_id: project_id, doc_id: doc_id, error: error, "applied update"
 			model.getSnapshot doc_key, (error, data) =>
 				return callback(error) if error?
 				docLines = data.snapshot.split(/\r\n|\n|\r/)
diff --git a/services/document-updater/app/coffee/UpdateManager.coffee b/services/document-updater/app/coffee/UpdateManager.coffee
index 43aea49512..bfcfb806ca 100644
--- a/services/document-updater/app/coffee/UpdateManager.coffee
+++ b/services/document-updater/app/coffee/UpdateManager.coffee
@@ -47,7 +47,7 @@ module.exports = UpdateManager =
 		profile = new Profiler("fetchAndApplyUpdates", {project_id, doc_id})
 		RealTimeRedisManager.getPendingUpdatesForDoc doc_id, (error, updates) =>
 			return callback(error) if error?
-			logger.info {project_id: project_id, doc_id: doc_id, count: updates.length}, "processing updates"
+			logger.log {project_id: project_id, doc_id: doc_id, count: updates.length}, "processing updates"
 			if updates.length == 0
 				return callback()
 			profile.log("getPendingUpdatesForDoc")
diff --git a/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee
index 736ceeee2d..c52bb4b30d 100644
--- a/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/DocumentManager/DocumentManagerTests.coffee
@@ -16,7 +16,7 @@ describe "DocumentManager", ->
 			"./HistoryManager": @HistoryManager =
 				flushDocChangesAsync: sinon.stub()
 				flushProjectChangesAsync: sinon.stub()
-			"logger-sharelatex": @logger = {log: sinon.stub(), info: sinon.stub()}
+			"logger-sharelatex": @logger = {log: sinon.stub()}
 			"./DocOpsManager": @DocOpsManager = {}
 			"./Metrics": @Metrics =
 				Timer: class Timer
diff --git a/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee b/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee
index a1d0e11b81..ca3937d4c5 100644
--- a/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/HistoryRedisManager/HistoryRedisManagerTests.coffee
@@ -19,9 +19,7 @@ describe "HistoryRedisManager", ->
 						key_schema:
 							uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:#{doc_id}"
 							docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:#{project_id}"
-			"logger-sharelatex":
-				log: ->
-				info: ->
+			"logger-sharelatex": { log: () -> }
 		@doc_id = "doc-id-123"
 		@project_id = "project-id-123"
 		@callback = sinon.stub()
diff --git a/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee b/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee
index 46daa9a63b..ab6718c12a 100644
--- a/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee
+++ b/services/document-updater/test/unit/coffee/HttpController/HttpControllerTests.coffee
@@ -12,7 +12,7 @@ describe "HttpController", ->
 			"./HistoryManager": @HistoryManager =
 				flushProjectChangesAsync: sinon.stub()
 			"./ProjectManager": @ProjectManager = {}
-			"logger-sharelatex" : @logger = { log: sinon.stub(), info: sinon.stub() }
+			"logger-sharelatex" : @logger = { log: sinon.stub() }
 			"./Metrics": @Metrics = {}
 			"./Errors" : Errors
 		@Metrics.Timer = class Timer
@@ -59,7 +59,7 @@ describe "HttpController", ->
 					.should.equal true
 
 			it "should log the request", ->
-				@logger.info
+				@logger.log
 					.calledWith(doc_id: @doc_id, project_id: @project_id, "getting doc via http")
 					.should.equal true
 
@@ -88,7 +88,7 @@ describe "HttpController", ->
 					.should.equal true
 
 			it "should log the request", ->
-				@logger.info
+				@logger.log
 					.calledWith(doc_id: @doc_id, project_id: @project_id, "getting doc via http")
 					.should.equal true
 
@@ -475,7 +475,7 @@ describe "HttpController", ->
 					.should.equal true
 
 			it "should log the request", ->
-				@logger.info
+				@logger.log
 					.calledWith({project_id: @project_id, exclude: []}, "getting docs via http")
 					.should.equal true
 
diff --git a/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee b/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee
index e7322f0e63..b11c73489e 100644
--- a/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/RangesManager/RangesManagerTests.coffee
@@ -7,15 +7,10 @@ SandboxedModule = require('sandboxed-module')
 
 describe "RangesManager", ->
 	beforeEach ->
-		@logger = 
-			error: sinon.stub()
-			log: sinon.stub()
-			warn: sinon.stub()
-			info: sinon.stub()
-
 		@RangesManager = SandboxedModule.require modulePath,
 			requires:
-				"logger-sharelatex": @logger 
+				"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub() }
+
 		@doc_id = "doc-id-123"
 		@project_id = "project-id-123"
 		@user_id = "user-id-123"
@@ -189,7 +184,7 @@ describe "RangesManager", ->
 		beforeEach ->
 			@RangesManager = SandboxedModule.require modulePath,
 				requires:
-					"logger-sharelatex": @logger
+					"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub() }
 					"./RangesTracker":@RangesTracker = SandboxedModule.require "../../../../app/js/RangesTracker.js"
 
 			@ranges = {
@@ -231,7 +226,7 @@ describe "RangesManager", ->
 					done()
 
 			it "should log the call with the correct number of changes", ->
-				@logger.info
+				@logger.log
 					.calledWith("accepting 1 changes in ranges")
 					.should.equal true
 
@@ -263,7 +258,7 @@ describe "RangesManager", ->
 					done()
 
 			it "should log the call with the correct number of changes", ->
-				@logger.info
+				@logger.log
 					.calledWith("accepting #{ @change_ids.length } changes in ranges")
 					.should.equal true
 
diff --git a/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee
index 9505339ddf..4f6c24720e 100644
--- a/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/RedisManager/RedisManagerTests.coffee
@@ -14,7 +14,7 @@ describe "RedisManager", ->
 		tk.freeze(new Date())
 		@RedisManager = SandboxedModule.require modulePath,
 			requires:
-				"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub(), info:-> }
+				"logger-sharelatex": @logger = { error: sinon.stub(), log: sinon.stub(), warn: sinon.stub() }
 				"./ProjectHistoryRedisManager": @ProjectHistoryRedisManager = {}
 				"settings-sharelatex": @settings = {
 					documentupdater: {logHashErrors: {write:true, read:true}}
diff --git a/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee b/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee
index d95e7497fb..b7364b00a4 100644
--- a/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/ShareJsUpdateManager/ShareJsUpdateManagerTests.coffee
@@ -16,7 +16,7 @@ describe "ShareJsUpdateManager", ->
 						constructor: (@db) ->
 				"./ShareJsDB" : @ShareJsDB = { mockDB: true }
 				"redis-sharelatex" : createClient: () => @rclient = auth:->
-				"logger-sharelatex": @logger = { log: sinon.stub(), info: -> }
+				"logger-sharelatex": @logger = { log: sinon.stub() }
 				"./RealTimeRedisManager": @RealTimeRedisManager = {}
 			globals:
 				clearTimeout: @clearTimeout = sinon.stub()
diff --git a/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee b/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee
index 623e2eec0c..383bd1848e 100644
--- a/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/UpdateManager/UpdateManagerTests.coffee
@@ -16,7 +16,7 @@ describe "UpdateManager", ->
 			"./RealTimeRedisManager" : @RealTimeRedisManager = {}
 			"./ShareJsUpdateManager" : @ShareJsUpdateManager = {}
 			"./HistoryManager" : @HistoryManager = {}
-			"logger-sharelatex": @logger = { log: sinon.stub(), info:-> }
+			"logger-sharelatex": @logger = { log: sinon.stub() }
 			"./Metrics": @Metrics =
 				Timer: class Timer
 					done: sinon.stub()

From 2998750a33a6ea0c20d7f7666daa92070317105a Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Wed, 6 Feb 2019 16:01:44 +0000
Subject: [PATCH 22/28] fix redis version lock

---
 services/document-updater/npm-shrinkwrap.json | 2 +-
 services/document-updater/package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/document-updater/npm-shrinkwrap.json b/services/document-updater/npm-shrinkwrap.json
index 26742b3c9b..095e360c00 100644
--- a/services/document-updater/npm-shrinkwrap.json
+++ b/services/document-updater/npm-shrinkwrap.json
@@ -1284,7 +1284,7 @@
     },
     "redis-sharelatex": {
       "version": "1.0.5",
-      "from": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.5.tgz",
+      "from": "redis-sharelatex@latest",
       "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.5.tgz",
       "dependencies": {
         "coffee-script": {
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 5ab28811b8..fa95246d21 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -26,7 +26,7 @@
     "logger-sharelatex": "^1.6.0",
     "lynx": "0.0.11",
     "metrics-sharelatex": "^2.1.1",
-    "redis-sharelatex": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.5.tgz",
+    "redis-sharelatex": "^1.0.5",
     "request": "2.25.0",
     "requestretry": "^1.12.0",
     "sandboxed-module": "~0.2.0",

From 73bd2644019d5558cfaad03c7559fa785684080b Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 7 Feb 2019 14:55:24 +0000
Subject: [PATCH 23/28] remove realtime keys in settings, no longer used

---
 services/document-updater/config/settings.defaults.coffee | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index 20d0a53549..9ae402bc4e 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -20,12 +20,6 @@ module.exports =
 			url: "http://#{process.env["PROJECT_HISTORY_HOST"] or "localhost"}:3054"
 
 	redis:
-		realtime:
-			port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
-			host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
-			password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
-			redisOptions:
-				keepAlive: 100
 
 		history:
 			port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"

From b5564095f35975b1bbf76790556c5561d858dbc3 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 7 Feb 2019 15:10:40 +0000
Subject: [PATCH 24/28] add /health_check/redis route back in

---
 services/document-updater/app.coffee | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index a22a552d59..04f884930e 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -71,7 +71,16 @@ app.get '/status', (req, res)->
 	else
 		res.send('document updater is alive')
 
+
 docUpdaterRedisClient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
+app.get "/health_check/redis", (req, res, next) ->
+	docUpdaterRedisClient.healthCheck (error) ->
+		if error?
+			logger.err {err: error}, "failed redis health check"
+			res.send 500
+		else
+			res.send 200
+
 app.get "/health_check/redis_cluster", (req, res, next) ->
 	docUpdaterRedisClient.healthCheck (error) ->
 		if error?

From ecaef6485b236d7c3dbe305b3c00481a8377bbdb Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 7 Feb 2019 15:27:51 +0000
Subject: [PATCH 25/28] revert the removal of realtime keyspace

---
 .../document-updater/app/coffee/DispatchManager.coffee   | 2 +-
 .../app/coffee/RealTimeRedisManager.coffee               | 4 ++--
 .../document-updater/config/settings.defaults.coffee     | 9 +++++++++
 .../acceptance/coffee/helpers/DocUpdaterClient.coffee    | 6 +++---
 .../coffee/DispatchManager/DispatchManagerTests.coffee   | 2 +-
 .../RealTimeRedisManagerTests.coffee                     | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/services/document-updater/app/coffee/DispatchManager.coffee b/services/document-updater/app/coffee/DispatchManager.coffee
index e751534068..93a22bfc07 100644
--- a/services/document-updater/app/coffee/DispatchManager.coffee
+++ b/services/document-updater/app/coffee/DispatchManager.coffee
@@ -10,7 +10,7 @@ RateLimitManager = require('./RateLimitManager')
 
 module.exports = DispatchManager =
 	createDispatcher: (RateLimiter) ->
-		client = redis.createClient(Settings.redis.documentupdater)
+		client = redis.createClient(Settings.redis.realtime)
 		worker = {
 			client: client
 			_waitForUpdateThenDispatchWorker: (callback = (error) ->) ->
diff --git a/services/document-updater/app/coffee/RealTimeRedisManager.coffee b/services/document-updater/app/coffee/RealTimeRedisManager.coffee
index 64bbe572b8..7da7ca1f64 100644
--- a/services/document-updater/app/coffee/RealTimeRedisManager.coffee
+++ b/services/document-updater/app/coffee/RealTimeRedisManager.coffee
@@ -1,6 +1,6 @@
 Settings = require('settings-sharelatex')
-rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
-Keys = Settings.redis.documentupdater.key_schema
+rclient = require("redis-sharelatex").createClient(Settings.redis.realtime)
+Keys = Settings.redis.realtime.key_schema
 logger = require('logger-sharelatex')
 
 MAX_OPS_PER_ITERATION = 8 # process a limited number of ops for safety
diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee
index 9ae402bc4e..2fbe80915f 100755
--- a/services/document-updater/config/settings.defaults.coffee
+++ b/services/document-updater/config/settings.defaults.coffee
@@ -21,6 +21,15 @@ module.exports =
 
 	redis:
 
+		realtime:	
+			port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"	
+			host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"	
+			password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""	
+			redisOptions:	
+				keepAlive: 100
+			key_schema:	
+				pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
+				
 		history:
 			port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
 			host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
diff --git a/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee b/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee
index 587e6f3af9..7f50d64372 100644
--- a/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee
+++ b/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee
@@ -1,10 +1,10 @@
 Settings = require('settings-sharelatex')
-rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
-keys = Settings.redis.documentupdater.key_schema
+rclient = require("redis-sharelatex").createClient(Settings.redis.realtime)
+keys = Settings.redis.realtime.key_schema
 request = require("request").defaults(jar: false)
 async = require "async"
 
-rclient_sub = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
+rclient_sub = require("redis-sharelatex").createClient(Settings.redis.realtime)
 rclient_sub.subscribe "applied-ops"
 rclient_sub.setMaxListeners(0)
 	
diff --git a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
index 85cdcb5a7e..990688ce86 100644
--- a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
@@ -13,7 +13,7 @@ describe "DispatchManager", ->
 			"logger-sharelatex": @logger = { log: sinon.stub() }
 			"settings-sharelatex": @settings =
 				redis:
-					documentupdater: {}
+					realtime: {}
 			"redis-sharelatex": @redis = {}
 			"./RateLimitManager": {}
 			"./Metrics":
diff --git a/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee b/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee
index 375b85df78..a04da996dc 100644
--- a/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee
@@ -15,7 +15,7 @@ describe "RealTimeRedisManager", ->
 			"redis-sharelatex": createClient: () => @rclient
 			"settings-sharelatex":
 				redis:
-					documentupdater: @settings =
+					realtime: @settings =
 						key_schema:
 							pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
 			"logger-sharelatex": { log: () -> }

From 08723f89722d5c43e60afe70df249533e2a9aef2 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 7 Feb 2019 15:53:26 +0000
Subject: [PATCH 26/28] revert health check redis types

---
 services/document-updater/app.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index 04f884930e..26d5db40b6 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -71,16 +71,16 @@ app.get '/status', (req, res)->
 	else
 		res.send('document updater is alive')
 
-
-docUpdaterRedisClient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
+webRedisClient = require("redis-sharelatex").createClient(Settings.redis.realtime)
 app.get "/health_check/redis", (req, res, next) ->
-	docUpdaterRedisClient.healthCheck (error) ->
+	webRedisClient.healthCheck (error) ->
 		if error?
 			logger.err {err: error}, "failed redis health check"
 			res.send 500
 		else
 			res.send 200
-
+			
+docUpdaterRedisClient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
 app.get "/health_check/redis_cluster", (req, res, next) ->
 	docUpdaterRedisClient.healthCheck (error) ->
 		if error?

From 3bc4cb492a7fad6b7587a29e155993bd697d27c4 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 7 Feb 2019 16:27:52 +0000
Subject: [PATCH 27/28] added log line

---
 services/document-updater/app/coffee/DispatchManager.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/document-updater/app/coffee/DispatchManager.coffee b/services/document-updater/app/coffee/DispatchManager.coffee
index 93a22bfc07..cfefa3e9d0 100644
--- a/services/document-updater/app/coffee/DispatchManager.coffee
+++ b/services/document-updater/app/coffee/DispatchManager.coffee
@@ -16,6 +16,7 @@ module.exports = DispatchManager =
 			_waitForUpdateThenDispatchWorker: (callback = (error) ->) ->
 				timer = new Metrics.Timer "worker.waiting"
 				worker.client.blpop "pending-updates-list", 0, (error, result) ->
+					logger.log("getting pending-updates-list", error, result)
 					timer.done()
 					return callback(error) if error?
 					return callback() if !result?

From 0a0fc91f282dce72ae1cccda2f483542e6218cd7 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Tue, 12 Feb 2019 13:27:13 +0000
Subject: [PATCH 28/28] Update app.coffee

---
 services/document-updater/app.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee
index 26d5db40b6..70c3fc875d 100644
--- a/services/document-updater/app.coffee
+++ b/services/document-updater/app.coffee
@@ -1,5 +1,5 @@
 Metrics = require "metrics-sharelatex"
-Metrics.initialize("document-updater")
+Metrics.initialize("doc-updater")
 
 express = require('express')
 http = require("http")