{main,ssh_server}.go: Log listening addresses

2 files changed, 13 insertions, 11 deletions

diff --git a/main.go b/main.go
index 0e0f91e..23ee558 100644
--- a/main.go
+++ b/main.go
@@ -26,18 +26,25 @@ func main() {
 		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, "Listening SSH: "+err.Error())
+		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 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 fb23db6..e841e65 100644
--- a/ssh_server.go
+++ b/ssh_server.go
@@ -17,7 +17,7 @@ var (
 	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
@@ -82,11 +82,6 @@ func serve_ssh() error {
 
 	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)
 		if err != nil {