Merge pull request #58 from CS3219-AY2425S1/ui-update

FIX FIX ANDFIC
CS3219-AY2425S1 · Nov 13, 2024 · 3eb48b0 · 3eb48b0
2 parents a5bb719 + 17cfdb4
commit 3eb48b0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/kubernetes/chat-service/chat-backend-config.yaml b/kubernetes/chat-service/chat-backend-config.yaml
@@ -0,0 +1,6 @@
+apiVersion: cloud.google.com/v1
+kind: BackendConfig
+metadata:
+  name: chat-service-backendconfig
+spec:
+  timeoutSec: 1800
diff --git a/kubernetes/chat-service/chat-service.yaml b/kubernetes/chat-service/chat-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: chat-service
   annotations:
-    cloud.google.com/backend-config: '{"default": "chat-service-backendconfig"}'
+    cloud.google.com/backend-config: '{"ports": {"3006":"chat-service-backendconfig"}}'
   labels:
     app: chat-service
 spec:
@@ -13,4 +13,6 @@ spec:
   ports:
     - name: chat-service
       port: 3006
-      targetPort: 3006
+      targetPort: 3006
+
+
diff --git a/kubernetes/collab-service/collab-backend-config.yaml b/kubernetes/collab-service/collab-backend-config.yaml
@@ -0,0 +1,6 @@
+apiVersion: cloud.google.com/v1
+kind: BackendConfig
+metadata:
+  name: collab-service-backendconfig
+spec:
+  timeoutSec: 1800
diff --git a/kubernetes/collab-service/collab-service.yaml b/kubernetes/collab-service/collab-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: collab-service
   annotations:
-    cloud.google.com/backend-config: '{"default": "collab-service-backendconfig"}'
+    cloud.google.com/backend-config: '{"ports": {"3004":"collab-service-backendconfig"}}'
   labels:
     app: collab-service
 spec:
@@ -13,4 +13,6 @@ spec:
   ports:
     - name: collab-service
       port: 3004
-      targetPort: 3004
+      targetPort: 3004
+
+
diff --git a/server/chat-service/server.js b/server/chat-service/server.js
@@ -12,9 +12,7 @@ const io = new Server(server, {
     allowedHeaders:
       "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
     credentials: true,
-  },
-  pingTimeout: 300000,
-  pingInterval: 100000
+  }
 });
 
 io.on("connection", (socket) => {

diff --git a/server/collaboration-service/server.js b/server/collaboration-service/server.js
@@ -12,9 +12,7 @@ const io = new Server(server, {
     allowedHeaders:
       "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
     credentials: true,
-  },
-  pingTimeout: 300000,
-  pingInterval: 100000
+  }
 });
 
 io.on("connection", (socket) => {