From 9e5425d718e37c3a05b4fe6e6ef93b0084a3e0f9 Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Thu, 13 Feb 2025 14:55:06 +0800
Subject: [PATCH] {main,ssh_server}.go: Log listening addresses

---
 main.go       | 17 ++++++++++++-----
 ssh_server.go |  7 +------

diff --git a/main.go b/main.go
index 0e0f91ed1a017e4db159ebc4d64ce20d10a87db4..23ee558628721ed63087d06cbae2ca2d0a0ae7a2 100644
--- a/main.go
+++ b/main.go
@@ -26,18 +26,25 @@ 	if err != nil {
 		clog.Fatal(1, "Loading templates: "+err.Error())
 	}
 
-	listener, err := net.Listen(config.HTTP.Net, config.HTTP.Addr)
+	ssh_listener, err := net.Listen(config.SSH.Net, config.SSH.Addr)
 	if err != nil {
-		clog.Fatal(1, "Listening: "+err.Error())
+		clog.Fatal(1, "Listening SSH: "+err.Error())
 	}
 
-	err = serve_ssh()
+	err = serve_ssh(ssh_listener)
+	if err != nil {
+		clog.Fatal(1, "Serving SSH: "+err.Error())
+	}
+	clog.Info("Listening SSH on " + config.SSH.Net + " " + config.SSH.Addr)
+
+	listener, err := net.Listen(config.HTTP.Net, config.HTTP.Addr)
 	if err != nil {
-		clog.Fatal(1, "Listening SSH: "+err.Error())
+		clog.Fatal(1, "Listening HTTP: "+err.Error())
 	}
+	clog.Info("Listening HTTP on " + config.HTTP.Net + " " + config.HTTP.Addr)
 
 	err = http.Serve(listener, &http_router_t{})
 	if err != nil {
-		clog.Fatal(1, "Serving: "+err.Error())
+		clog.Fatal(1, "Serving HTTP: "+err.Error())
 	}
 }
diff --git a/ssh_server.go b/ssh_server.go
index fb23db629e59cf7057ca4c975a3989cca9a27f1e..e841e65b7c8d69b05add3961351f59881b871a64 100644
--- a/ssh_server.go
+++ b/ssh_server.go
@@ -17,7 +17,7 @@ 	server_public_key_fingerprint string
 	server_public_key             go_ssh.PublicKey
 )
 
-func serve_ssh() error {
+func serve_ssh(listener net.Listener) error {
 	host_key_bytes, err := os.ReadFile(config.SSH.Key)
 	if err != nil {
 		return err
@@ -81,11 +81,6 @@ 		KeyboardInteractiveHandler: func(ctx glider_ssh.Context, challenge go_ssh.KeyboardInteractiveChallenge) bool { return true },
 	}
 
 	server.AddHostKey(host_key)
-
-	listener, err := net.Listen(config.SSH.Net, config.SSH.Addr)
-	if err != nil {
-		return err
-	}
 
 	go func() {
 		err = server.Serve(listener)

-- 
2.48.1