From 9402fc0bdf7d52708522319998af92b58468310c Mon Sep 17 00:00:00 2001
From: Dean Sheather <dean@deansheather.com>
Date: Sun, 16 Jun 2019 19:50:38 +1000
Subject: [PATCH] use port from server.address() when printing URL

This allows the use of port 0, which is interpretted automatically to
mean "random port".

Additional logging consistency fixes.
---
 packages/server/src/cli.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index 6b809c887a75..34edee57446d 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -279,10 +279,11 @@ const bold = (text: string | number): string | number => {
 		} : undefined,
 	});
 
-	logger.info("Starting webserver...", field("host", options.host), field("port", options.port));
 	if (options.socket) {
+		logger.info("Starting webserver via socket...", field("socket", options.socket));
 		app.server.listen(options.socket);
 	} else {
+		logger.info("Starting webserver...", field("host", options.host), field("port", options.port));
 		app.server.listen(options.port, options.host);
 	}
 	let clientId = 1;
@@ -323,14 +324,20 @@ const bold = (text: string | number): string | number => {
 		logger.warn("Launched without authentication.");
 	}
 	if (options.disableTelemetry) {
-		logger.info("Telemetry is disabled");
+		logger.info(" ");
+		logger.info("Telemetry is disabled.");
 	}
 
-	const protocol = options.allowHttp ? "http" : "https";
-	const url = `${protocol}://localhost:${options.port}/`;
 	logger.info(" ");
-	logger.info("Started (click the link below to open):");
-	logger.info(url);
+	if (options.socket) {
+		logger.info("Started on socket address:");
+		logger.info(options.socket);
+	} else {
+		const protocol = options.allowHttp ? "http" : "https";
+		const url = `${protocol}://localhost:${app.server.address().port}/`;
+		logger.info("Started (click the link below to open):");
+		logger.info(url);
+	}
 	logger.info(" ");
 
 	if (options.open) {