From 0ff4444d7230600cf0ece4e1320334278dcb42d6 Mon Sep 17 00:00:00 2001
From: David Cowden <dcow@smallstep.com>
Date: Tue, 16 Jun 2020 23:28:13 -0700
Subject: [PATCH] server: Logging touch-up

* Fix redundant log previx
* Add more info to channel accept/reject logs
---
 server.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server.go b/server.go
index 3335989..1c6344d 100644
--- a/server.go
+++ b/server.go
@@ -220,7 +220,7 @@ func (srv *Server) Serve(listener net.Listener) error {
 		if max := 1 * time.Second; delay > max {
 			delay = max
 		}
-		srv.L.Printf("ssh: Accept error: %v; retrying in %v", err, delay)
+		srv.L.Printf("Server accept error '%v'; retrying in %v ns", err, delay)
 		time.Sleep(delay)
 	}
 
@@ -432,13 +432,13 @@ func (srv *Server) ssh(conn *ServerConn, channels <-chan ssh.NewChannel) {
 			unknown := ssh.UnknownChannelType
 			err := candidate.Reject(unknown, "unknown channel type")
 			if err != nil {
-				log.Printf("reject %s: %v", t, err)
+				log.Printf("Server error rejecting channel '%s': %v", t, err)
 			}
 			continue
 		}
 		channel, requests, err := candidate.Accept()
 		if err != nil {
-			srv.L.Printf("accept %s: %v", t, err)
+			srv.L.Printf("Server error accepting channel '%s': %v", t, err)
 			continue
 		}
 		ctx, cancel := context.WithCancel(conn.Context)
-- 
GitLab