Merge branch 'master' of gitlab.utu.fi:nicolas.pope/ftl-web

docker-compose.yml

@@ -32,6 +32,9 @@ services:
     environment:
       NODE_ENV: development
       REDIS_HOST: redis
+    depends_on:
+      - redis
+      - authmongo
     volumes:
       - ./:/usr/src/app
   authservice:
@@ -44,6 +47,9 @@ services:
       NODE_ENV: development
       REDIS_HOST: redis
       MONGO_HOST: authmongo
+    depends_on:
+      - redis
+      - authmongo
     volumes:
       - ./:/usr/src/app
   nodeservice:
@@ -56,6 +62,9 @@ services:
       NODE_ENV: development
       REDIS_HOST: redis
       MONGO_HOST: authmongo
+    depends_on:
+      - redis
+      - authmongo
     volumes:
       - ./:/usr/src/app
   configservice:
@@ -68,6 +77,9 @@ services:
       NODE_ENV: development
       REDIS_HOST: redis
       MONGO_HOST: authmongo
+    depends_on:
+      - redis
+      - authmongo
     volumes:
       - ./:/usr/src/app
   recorderservice:
@@ -79,6 +91,9 @@ services:
     environment:
       NODE_ENV: development
       REDIS_HOST: redis
+    depends_on:
+      - redis
+      - authmongo
     volumes:
       - ./:/usr/src/app
       - "$HOME/ftl-data:/data/ftl"
@@ -92,8 +107,12 @@ services:
       NODE_ENV: development
       REDIS_HOST: redis
       MONGO_HOST: authmongo
+    depends_on:
+      - redis
+      - authmongo
     volumes:
       - ./:/usr/src/app
+      
   authmongo:
     image: mongo:4.2
     restart: always

packages/client/reverseproxy.conf

@@ -4,27 +4,34 @@ client_max_body_size 20M;
 server_tokens off;
 
 upstream socket_upstream {
-    server ${FTL_SOCKET_SERVICE};
+    server ${FTL_SOCKET_SERVICE} max_fails=1 fail_timeout=1s;
+    server ${FTL_SOCKET_SERVICE} max_fails=1 fail_timeout=1s;
 }
 
 upstream auth_upstream {
-    server ${FTL_AUTH_SERVICE};
+    server ${FTL_AUTH_SERVICE} max_fails=1 fail_timeout=1s;
+    server ${FTL_AUTH_SERVICE} max_fails=1 fail_timeout=1s;
 }
 
 upstream node_upstream {
-    server ${FTL_NODE_SERVICE};
+    server ${FTL_NODE_SERVICE} max_fails=1 fail_timeout=1s;
+    server ${FTL_NODE_SERVICE} max_fails=1 fail_timeout=1s;
 }
 
 upstream stream_upstream {
-    server ${FTL_STREAM_SERVICE};
+    server ${FTL_STREAM_SERVICE} max_fails=1 fail_timeout=1s;
+    server ${FTL_STREAM_SERVICE} max_fails=1 fail_timeout=1s;
 }
 
 upstream config_upstream {
-    server ${FTL_CONFIG_SERVICE};
+    server ${FTL_CONFIG_SERVICE} max_fails=1 fail_timeout=1s;
+    server ${FTL_CONFIG_SERVICE} max_fails=1 fail_timeout=1s;
 }
 
 upstream recorder_upstream {
-    server ${FTL_RECORDER_SERVICE};
+    server ${FTL_RECORDER_SERVICE} max_fails=1 fail_timeout=1s;
+    server ${FTL_RECORDER_SERVICE} max_fails=1 fail_timeout=1s;
+
 }
 
 map $http_upgrade $connection_upgrade {