fix(tunnel): fix ups race condition

Author: MasterPtato

Cargo.lock

@@ -150,7 +150,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10

docker/dev-host/docker-compose.yml

@@ -184,7 +184,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -224,7 +224,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -264,7 +264,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -444,7 +444,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -484,7 +484,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -524,7 +524,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -702,7 +702,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -742,7 +742,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -782,7 +782,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10

docker/dev-multidc-multinode/docker-compose.yml

@@ -182,7 +182,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -330,7 +330,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -476,7 +476,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10

docker/dev-multidc/docker-compose.yml

@@ -173,7 +173,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -210,7 +210,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10
@@ -247,7 +247,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10

docker/dev-multinode/docker-compose.yml

@@ -173,7 +173,7 @@ services:
         - CMD
         - curl
         - '-f'
-        - http://127.0.0.1:6421/health
+        - http://127.0.0.1:6420/health
       interval: 2s
       timeout: 10s
       retries: 10

docker/dev/docker-compose.yml

@@ -32,6 +32,13 @@
 	"postgres": {
 		"url": "postgresql://postgres:postgres@postgres:5432/rivet_engine"
 	},
+	"postgres_notify": {
+		"url": "postgresql://postgres:postgres@postgres:5432/rivet_engine",
+		"memory_optimization": false
+	},
+	// "memory": {
+	// 	"channel": "default"
+	// },
 	"cache": {
 		"driver": "in_memory"
 	},

docker/dev/rivet-engine/config.jsonc

@@ -294,7 +294,7 @@ export function generateDockerCompose(context: TemplateContext) {
             ],
             ports: isPrimary && i === 0 ? [`6420:6420`] : undefined,
             healthcheck: {
-               test: ["CMD", "curl", "-f", "http://127.0.0.1:6421/health"],
+               test: ["CMD", "curl", "-f", "http://127.0.0.1:6420/health"],
                interval: "2s",
                timeout: "10s",
                retries: 10,

docker/template/src/docker-compose.ts

@@ -193,6 +193,7 @@ impl Root {
 		{
 			self.pubsub = Some(PubSub::PostgresNotify(pubsub::Postgres {
 				url: pg.url.clone(),
+				memory_optimization: true,
 			}));
 		}
 

packages/common/config/src/config/mod.rs

@@ -9,17 +9,18 @@ edition.workspace = true
 anyhow.workspace = true
 async-nats.workspace = true
 async-trait.workspace = true
+base64.workspace = true
 deadpool-postgres.workspace = true
 futures-util.workspace = true
+moka.workspace = true
 rivet-error.workspace = true
-serde.workspace = true
 serde_json.workspace = true
+serde.workspace = true
+sha2.workspace = true
+tokio-postgres.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 uuid.workspace = true
-tokio-postgres.workspace = true
-base64 = "0.22"
-sha2.workspace = true
 
 [dev-dependencies]
 rivet-config.workspace = true