From 69a6cbaa462141340485b5e7cbcb9f8f92c01ac4 Mon Sep 17 00:00:00 2001
From: Sean McBride <spmcbride1201@gmail.com>
Date: Mon, 25 Apr 2022 20:58:33 -0400
Subject: [PATCH] fix: Correct tenant listen bug

---
 .vscode/settings.json         | 12 ++++++++++--
 runtime/include/tcp_server.h  |  2 ++
 runtime/src/listener_thread.c |  2 --
 runtime/src/main.c            | 26 ++++++++++++--------------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 79706f3..49b45ad 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -112,7 +112,14 @@
 		"sledge_abi.h": "c",
 		"vec.h": "c",
 		"module_database.h": "c",
-		"perf_window_t.h": "c"
+		"perf_window_t.h": "c",
+		"typeinfo": "c",
+		"module_config.h": "c",
+		"tenant.h": "c",
+		"route_config.h": "c",
+		"http_router.h": "c",
+		"admissions_info.h": "c",
+		"tcp_server.h": "c"
 	},
 	"files.exclude": {
 		"**/.git": true,
@@ -173,5 +180,6 @@
 		"mctx",
 		"TKILL",
 		"WASI"
-	]
+	],
+	"C_Cpp.errorSquiggles": "Enabled"
 }
diff --git a/runtime/include/tcp_server.h b/runtime/include/tcp_server.h
index 41d5a9a..67a0a16 100644
--- a/runtime/include/tcp_server.h
+++ b/runtime/include/tcp_server.h
@@ -80,6 +80,8 @@ tcp_server_listen(struct tcp_server *server)
 	rc = listen(socket_descriptor, TCP_SERVER_MAX_PENDING_CLIENT_REQUESTS);
 	if (unlikely(rc < 0)) goto err_listen;
 
+	printf("Listening on port %d\n", server->port);
+
 	rc = 0;
 done:
 	return rc;
diff --git a/runtime/src/listener_thread.c b/runtime/src/listener_thread.c
index 8b3e964..198ac45 100644
--- a/runtime/src/listener_thread.c
+++ b/runtime/src/listener_thread.c
@@ -193,8 +193,6 @@ listener_thread_main(void *dummy)
 					continue;
 				}
 
-				http_request_print(&session->http_request);
-
 				/*
 				 * Perform admissions control.
 				 * If 0, workload was rejected, so close with 429 "Too Many Requests"
diff --git a/runtime/src/main.c b/runtime/src/main.c
index 4b19cba..29fde94 100644
--- a/runtime/src/main.c
+++ b/runtime/src/main.c
@@ -451,8 +451,6 @@ main(int argc, char **argv)
 	if (tenant_config_vec_len < 0) { exit(-1); }
 	free(json_buf);
 
-	// for (int i = 0; i < tenant_config_vec_len; i++) { tenant_config_print(&tenant_config_vec[i]); }
-
 	for (int tenant_idx = 0; tenant_idx < tenant_config_vec_len; tenant_idx++) {
 		struct tenant *tenant = tenant_alloc(&tenant_config_vec[tenant_idx]);
 		int            rc     = tenant_database_add(tenant);
@@ -464,19 +462,19 @@ main(int argc, char **argv)
 		/* Start listening for requests */
 		rc = tenant_listen(tenant);
 		if (rc < 0) exit(-1);
+	}
 
-		for (int tenant_idx = 0; tenant_idx < tenant_config_vec_len; tenant_idx++) {
-			tenant_config_deinit(&tenant_config_vec[tenant_idx]);
-		}
-		free(tenant_config_vec);
-
-		for (int i = 0; i < runtime_worker_threads_count; i++) {
-			int ret = pthread_join(runtime_worker_threads[i], NULL);
-			if (ret) {
-				errno = ret;
-				perror("pthread_join");
-				exit(-1);
-			}
+	for (int tenant_idx = 0; tenant_idx < tenant_config_vec_len; tenant_idx++) {
+		tenant_config_deinit(&tenant_config_vec[tenant_idx]);
+	}
+	free(tenant_config_vec);
+
+	for (int i = 0; i < runtime_worker_threads_count; i++) {
+		int ret = pthread_join(runtime_worker_threads[i], NULL);
+		if (ret) {
+			errno = ret;
+			perror("pthread_join");
+			exit(-1);
 		}
 	}