Merge pull request #5338 from overleaf/bg-update-docupdater-logger

[docupdater] upgrade from logger-sharelatex to @overleaf/logger

GitOrigin-RevId: 26294a1e61d25b907d594a586f9b4714bc36ae4f

services/document-updater/app.js

@@ -3,7 +3,7 @@ Metrics.initialize('doc-updater')
 
 const express = require('express')
 const Settings = require('@overleaf/settings')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 logger.initialize('document-updater')
 
 logger.logger.addSerializers(require('./app/js/LoggerSerializers'))

services/document-updater/app/js/DeleteQueueManager.js

@@ -16,7 +16,7 @@ let DeleteQueueManager
 const Settings = require('@overleaf/settings')
 const RedisManager = require('./RedisManager')
 const ProjectManager = require('./ProjectManager')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const metrics = require('./Metrics')
 const async = require('async')
 

services/document-updater/app/js/DispatchManager.js

@@ -16,7 +16,7 @@
  */
 let DispatchManager
 const Settings = require('@overleaf/settings')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Keys = require('./UpdateKeys')
 const redis = require('@overleaf/redis-wrapper')
 const Errors = require('./Errors')

services/document-updater/app/js/DocumentManager.js

@@ -17,7 +17,7 @@ const RedisManager = require('./RedisManager')
 const ProjectHistoryRedisManager = require('./ProjectHistoryRedisManager')
 const PersistenceManager = require('./PersistenceManager')
 const DiffCodec = require('./DiffCodec')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Metrics = require('./Metrics')
 const HistoryManager = require('./HistoryManager')
 const RealTimeRedisManager = require('./RealTimeRedisManager')

services/document-updater/app/js/HistoryManager.js

@@ -13,7 +13,7 @@
  */
 let HistoryManager
 const async = require('async')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const request = require('request')
 const Settings = require('@overleaf/settings')
 const HistoryRedisManager = require('./HistoryRedisManager')

services/document-updater/app/js/HistoryRedisManager.js

@@ -17,7 +17,7 @@ const rclient = require('@overleaf/redis-wrapper').createClient(
   Settings.redis.history
 )
 const Keys = Settings.redis.history.key_schema
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 
 module.exports = HistoryRedisManager = {
   recordDocHasHistoryOps(project_id, doc_id, ops, callback) {

services/document-updater/app/js/HttpController.js

@@ -3,7 +3,7 @@ const HistoryManager = require('./HistoryManager')
 const ProjectManager = require('./ProjectManager')
 const RedisManager = require('./RedisManager')
 const Errors = require('./Errors')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Settings = require('@overleaf/settings')
 const Metrics = require('./Metrics')
 const ProjectFlusher = require('./ProjectFlusher')

services/document-updater/app/js/LockManager.js

@@ -17,7 +17,7 @@ const Settings = require('@overleaf/settings')
 const redis = require('@overleaf/redis-wrapper')
 const rclient = redis.createClient(Settings.redis.lock)
 const keys = Settings.redis.lock.key_schema
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const os = require('os')
 const crypto = require('crypto')
 

services/document-updater/app/js/PersistenceManager.js

@@ -1,7 +1,7 @@
 const Settings = require('@overleaf/settings')
 const Errors = require('./Errors')
 const Metrics = require('./Metrics')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const request = require('requestretry').defaults({
   maxAttempts: 2,
   retryDelay: 10,

services/document-updater/app/js/Profiler.js

@@ -10,7 +10,7 @@
  */
 let Profiler
 const Settings = require('@overleaf/settings')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 
 const deltaMs = function (ta, tb) {
   const nanoSeconds = (ta[0] - tb[0]) * 1e9 + (ta[1] - tb[1])

services/document-updater/app/js/ProjectFlusher.js

@@ -20,7 +20,7 @@ const docUpdaterKeys = Settings.redis.documentupdater.key_schema
 const async = require('async')
 const ProjectManager = require('./ProjectManager')
 const _ = require('lodash')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 
 var ProjectFlusher = {
   // iterate over keys asynchronously using redis scan (non-blocking)

services/document-updater/app/js/ProjectHistoryRedisManager.js

@@ -22,7 +22,7 @@ const projectHistoryKeys = __guard__(
 const rclient = require('@overleaf/redis-wrapper').createClient(
   Settings.redis.project_history
 )
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const metrics = require('./Metrics')
 
 module.exports = ProjectHistoryRedisManager = {

services/document-updater/app/js/ProjectManager.js

@@ -3,7 +3,7 @@ const ProjectHistoryRedisManager = require('./ProjectHistoryRedisManager')
 const DocumentManager = require('./DocumentManager')
 const HistoryManager = require('./HistoryManager')
 const async = require('async')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Metrics = require('./Metrics')
 const Errors = require('./Errors')
 

services/document-updater/app/js/RangesManager.js

@@ -13,7 +13,7 @@
  */
 let RangesManager
 const RangesTracker = require('./RangesTracker')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const _ = require('lodash')
 
 module.exports = RangesManager = {

services/document-updater/app/js/RateLimitManager.js

@@ -11,7 +11,7 @@
  */
 let RateLimiter
 const Settings = require('@overleaf/settings')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Metrics = require('./Metrics')
 
 module.exports = RateLimiter = class RateLimiter {

services/document-updater/app/js/RealTimeRedisManager.js

@@ -20,7 +20,7 @@ const pubsubClient = require('@overleaf/redis-wrapper').createClient(
   Settings.redis.pubsub
 )
 const Keys = Settings.redis.documentupdater.key_schema
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const os = require('os')
 const crypto = require('crypto')
 const metrics = require('./Metrics')

services/document-updater/app/js/RedisManager.js

@@ -18,7 +18,7 @@ const Settings = require('@overleaf/settings')
 const rclient = require('@overleaf/redis-wrapper').createClient(
   Settings.redis.documentupdater
 )
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const metrics = require('./Metrics')
 const Errors = require('./Errors')
 const crypto = require('crypto')

services/document-updater/app/js/ShareJsUpdateManager.js

@@ -15,7 +15,7 @@
 let ShareJsUpdateManager
 const ShareJsModel = require('./sharejs/server/model')
 const ShareJsDB = require('./ShareJsDB')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Settings = require('@overleaf/settings')
 const Keys = require('./UpdateKeys')
 const { EventEmitter } = require('events')

services/document-updater/app/js/UpdateManager.js

@@ -23,7 +23,7 @@ const HistoryManager = require('./HistoryManager')
 const Settings = require('@overleaf/settings')
 const _ = require('lodash')
 const async = require('async')
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Metrics = require('./Metrics')
 const Errors = require('./Errors')
 const DocumentManager = require('./DocumentManager')

services/document-updater/package.json

@@ -19,6 +19,7 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
+    "@overleaf/logger": "^2.3.0",
     "@overleaf/metrics": "^3.5.1",
     "@overleaf/o-error": "^3.3.1",
     "@overleaf/redis-wrapper": "^2.0.1",
@@ -29,7 +30,6 @@
     "diff-match-patch": "https://github.com/overleaf/diff-match-patch/archive/89805f9c671a77a263fc53461acd62aa7498f688.tar.gz",
     "express": "4.17.1",
     "lodash": "^4.17.21",
-    "logger-sharelatex": "^2.2.0",
     "mongodb": "^3.6.6",
     "request": "^2.88.2",
     "requestretry": "^4.1.2"

services/document-updater/test/acceptance/js/helpers/DocUpdaterApp.js

@@ -13,7 +13,7 @@
  */
 const app = require('../../../../app')
 const { waitForDb } = require('../../../../app/js/mongodb')
-require('logger-sharelatex').logger.level('fatal')
+require('@overleaf/logger').logger.level('fatal')
 
 module.exports = {
   running: false,

services/document-updater/test/setup.js

@@ -20,7 +20,7 @@ const stubs = {
 // SandboxedModule configuration
 SandboxedModule.configure({
   requires: {
-    'logger-sharelatex': stubs.logger,
+    '@overleaf/logger': stubs.logger,
   },
   globals: { Buffer, JSON, Math, console, process },
 })