Browse Source

[monorepo] remove contacts service (#33550)

GitOrigin-RevId: 15478243e4d6a56b81eee28f76f9ef7dc54a45d7
Jakob Ackermann 2 months ago
parent
commit
c7b56ff295

+ 0 - 1
develop/README.md

@@ -59,7 +59,6 @@ each service:
 | `web`              | 9229 |
 | `web`              | 9229 |
 | `clsi`             | 9230 |
 | `clsi`             | 9230 |
 | `chat`             | 9231 |
 | `chat`             | 9231 |
-| `contacts`         | 9232 |
 | `docstore`         | 9233 |
 | `docstore`         | 9233 |
 | `document-updater` | 9234 |
 | `document-updater` | 9234 |
 | `filestore`        | 9235 |
 | `filestore`        | 9235 |

+ 0 - 1
develop/dev.env

@@ -1,7 +1,6 @@
 CHAT_HOST=chat
 CHAT_HOST=chat
 CLSI_HOST=clsi
 CLSI_HOST=clsi
 DOWNLOAD_HOST=clsi-nginx
 DOWNLOAD_HOST=clsi-nginx
-CONTACTS_HOST=contacts
 DOCSTORE_HOST=docstore
 DOCSTORE_HOST=docstore
 DOCUMENT_UPDATER_HOST=document-updater
 DOCUMENT_UPDATER_HOST=document-updater
 FILESTORE_HOST=filestore
 FILESTORE_HOST=filestore

+ 0 - 11
develop/docker-compose.dev.yml

@@ -21,17 +21,6 @@ services:
       - ../services/chat/app.js:/overleaf/services/chat/app.js
       - ../services/chat/app.js:/overleaf/services/chat/app.js
       - ../services/chat/config:/overleaf/services/chat/config
       - ../services/chat/config:/overleaf/services/chat/config
 
 
-  contacts:
-    command: ["node", "--watch", "app.js"]
-    environment:
-      - NODE_OPTIONS=--inspect=0.0.0.0:9229
-    ports:
-      - "127.0.0.1:9232:9229"
-    volumes:
-      - ../services/contacts/app:/overleaf/services/contacts/app
-      - ../services/contacts/app.js:/overleaf/services/contacts/app.js
-      - ../services/contacts/config:/overleaf/services/contacts/config
-
   docstore:
   docstore:
     command: ["node", "--watch", "app.js"]
     command: ["node", "--watch", "app.js"]
     environment:
     environment:

+ 0 - 8
develop/docker-compose.yml

@@ -45,13 +45,6 @@ services:
       - ${PWD}/output:/output:ro
       - ${PWD}/output:/output:ro
       - ../services/clsi/nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
       - ../services/clsi/nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
 
 
-  contacts:
-    build:
-      context: ..
-      dockerfile: services/contacts/Dockerfile
-    env_file:
-      - dev.env
-
   docstore:
   docstore:
     build:
     build:
       context: ..
       context: ..
@@ -161,7 +154,6 @@ services:
       - redis
       - redis
       - chat
       - chat
       - clsi
       - clsi
-      - contacts
       - docstore
       - docstore
       - document-updater
       - document-updater
       - filestore
       - filestore

+ 0 - 1
package.json

@@ -224,7 +224,6 @@
     "services/clsi",
     "services/clsi",
     "services/clsi-cache",
     "services/clsi-cache",
     "services/clsi-perf",
     "services/clsi-perf",
-    "services/contacts",
     "services/docstore",
     "services/docstore",
     "services/document-updater",
     "services/document-updater",
     "services/filestore",
     "services/filestore",

+ 0 - 1
server-ce/config/env.sh

@@ -1,6 +1,5 @@
 export CHAT_HOST=127.0.0.1
 export CHAT_HOST=127.0.0.1
 export CLSI_HOST=127.0.0.1
 export CLSI_HOST=127.0.0.1
-export CONTACTS_HOST=127.0.0.1
 export DOCSTORE_HOST=127.0.0.1
 export DOCSTORE_HOST=127.0.0.1
 export DOCUMENT_UPDATER_HOST=127.0.0.1
 export DOCUMENT_UPDATER_HOST=127.0.0.1
 export DOCUPDATER_HOST=127.0.0.1
 export DOCUPDATER_HOST=127.0.0.1

+ 0 - 7
server-ce/init_scripts/300_delete_old_logs.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-# Up to version 2.5.0 the logs of the contacts service were written into a
-#  file that was not picked up by logrotate.
-# The service is stable and we can safely discard any logs.
-rm -vf /var/log/overleaf/contacts

+ 0 - 12
server-ce/runit/contacts-overleaf/run

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-NODE_PARAMS=""
-if [ "$DEBUG_NODE" == "true" ]; then
-    echo "running debug - contacts"
-    NODE_PARAMS="--inspect=0.0.0.0:30360"
-fi
-
-source /etc/overleaf/env.sh
-export LISTEN_ADDRESS=127.0.0.1
-
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/contacts/app.js >> /var/log/overleaf/contacts.log 2>&1

+ 0 - 3
server-ce/services.js

@@ -20,9 +20,6 @@ module.exports = [
   {
   {
     name: 'chat',
     name: 'chat',
   },
   },
-  {
-    name: 'contacts',
-  },
   {
   {
     name: 'notifications',
     name: 'notifications',
   },
   },

+ 0 - 3
services/web/test/acceptance/config/settings.test.defaults.js

@@ -72,9 +72,6 @@ module.exports = {
     realTime: {
     realTime: {
       url: 'http://127.0.0.1:23026',
       url: 'http://127.0.0.1:23026',
     },
     },
-    contacts: {
-      url: 'http://127.0.0.1:23036',
-    },
     notifications: {
     notifications: {
       url: 'http://127.0.0.1:23042',
       url: 'http://127.0.0.1:23042',
     },
     },

+ 2 - 30
yarn.lock

@@ -6477,34 +6477,6 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"@overleaf/contacts@workspace:services/contacts":
-  version: 0.0.0-use.local
-  resolution: "@overleaf/contacts@workspace:services/contacts"
-  dependencies:
-    "@overleaf/logger": "workspace:*"
-    "@overleaf/metrics": "workspace:*"
-    "@overleaf/migrations": "workspace:*"
-    "@overleaf/mongo-utils": "workspace:*"
-    "@overleaf/settings": "workspace:*"
-    async: "npm:^3.2.5"
-    body-parser: "npm:1.20.4"
-    bunyan: "npm:^1.8.15"
-    chai: "npm:^4.3.6"
-    chai-as-promised: "npm:^7.1.1"
-    esmock: "npm:^2.6.3"
-    express: "npm:4.22.1"
-    mocha: "npm:^11.1.0"
-    mocha-junit-reporter: "npm:^2.2.1"
-    mocha-multi-reporters: "npm:^1.5.1"
-    mongodb: "npm:6.12.0"
-    request: "npm:2.88.2"
-    sinon: "npm:~9.0.1"
-    sinon-chai: "npm:^3.7.0"
-    typescript: "npm:^5.0.4"
-    underscore: "npm:~1.13.1"
-  languageName: unknown
-  linkType: soft
-
 "@overleaf/dictionaries@https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz":
 "@overleaf/dictionaries@https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz":
   version: 0.0.3
   version: 0.0.3
   resolution: "@overleaf/dictionaries@https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz"
   resolution: "@overleaf/dictionaries@https://github.com/overleaf/dictionaries/archive/refs/tags/v0.0.3.tar.gz"
@@ -18078,7 +18050,7 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"esmock@npm:^2.6.3, esmock@npm:^2.7.3":
+"esmock@npm:^2.7.3":
   version: 2.7.3
   version: 2.7.3
   resolution: "esmock@npm:2.7.3"
   resolution: "esmock@npm:2.7.3"
   checksum: 10c0/71aebd7b82ad11bab56b9ff3897e105c0fc51eef9e9268c9406c3ca14401eddc8a69f2f381ae82e24d039452de5fc7f32ec694fdf3b1c6d724af22cf69e5f9dd
   checksum: 10c0/71aebd7b82ad11bab56b9ff3897e105c0fc51eef9e9268c9406c3ca14401eddc8a69f2f381ae82e24d039452de5fc7f32ec694fdf3b1c6d724af22cf69e5f9dd
@@ -33298,7 +33270,7 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"underscore@npm:1.13.8, underscore@npm:>=1.8.3, underscore@npm:~1.13.1":
+"underscore@npm:1.13.8, underscore@npm:>=1.8.3":
   version: 1.13.8
   version: 1.13.8
   resolution: "underscore@npm:1.13.8"
   resolution: "underscore@npm:1.13.8"
   checksum: 10c0/6677688daeda30484823e77c0b89ce4dcf29964a77d5a06f37299c007ab4bb1c66a0ff75e0d274620b62a1fe2a6ba29879f8214533ca611d71a1ae504f2bfc9b
   checksum: 10c0/6677688daeda30484823e77c0b89ce4dcf29964a77d5a06f37299c007ab4bb1c66a0ff75e0d274620b62a1fe2a6ba29879f8214533ca611d71a1ae504f2bfc9b