logging: Add [RemoteAddr] prefix to connection-related messages

diff --git a/host.go b/host.go
index b75ecdb5bcc5cc66f441dffeb26fbeda2f73b619..52e4416f7865e6037a4a0e09cfe46963a1a04406 100644 (file)
--- a/host.go
+++ b/host.go
@@ -114,7 +114,7 @@ func (h *Host) Connect(term *sshd.Terminal) {
                member, err = h.Join(user)
        }
        if err != nil {
-               logger.Errorf("Failed to join: %s", err)
+               logger.Errorf("[%s] Failed to join: %s", term.Conn.RemoteAddr(), err)
                return
        }
 
@@ -129,7 +129,7 @@ func (h *Host) Connect(term *sshd.Terminal) {
        }
        ratelimit := rateio.NewSimpleLimiter(3, time.Second*3)
 
-       logger.Debugf("Joined: %s", user.Name())
+       logger.Debugf("[%s] Joined: %s", term.Conn.RemoteAddr(), user.Name())
 
        for {
                line, err := term.ReadLine()
@@ -137,7 +137,7 @@ func (h *Host) Connect(term *sshd.Terminal) {
                        // Closed
                        break
                } else if err != nil {
-                       logger.Errorf("Terminal reading error: %s", err)
+                       logger.Errorf("[%s] Terminal reading error: %s", term.Conn.RemoteAddr(), err)
                        break
                }
 
@@ -174,10 +174,10 @@ func (h *Host) Connect(term *sshd.Terminal) {
 
        err = h.Leave(user)
        if err != nil {
-               logger.Errorf("Failed to leave: %s", err)
+               logger.Errorf("[%s] Failed to leave: %s", term.Conn.RemoteAddr(), err)
                return
        }
-       logger.Debugf("Leaving: %s", user.Name())
+       logger.Debugf("[%s] Leaving: %s", term.Conn.RemoteAddr(), user.Name())
 }
 
 // Serve our chat room onto the listener

diff --git a/sshd/net.go b/sshd/net.go
index f893a5619e21f0b8aa96b878ccf6cf1665d70f34..1b3f40288bfebbf56ee1f6e38049fe7a6232e797 100644 (file)
--- a/sshd/net.go
+++ b/sshd/net.go
@@ -50,7 +50,7 @@ func (l *SSHListener) Serve() {
                conn, err := l.Accept()
 
                if err != nil {
-                       logger.Printf("Failed to accept connection: %v", err)
+                       logger.Printf("Failed to accept connection: %s", err)
                        break
                }
 
@@ -58,7 +58,7 @@ func (l *SSHListener) Serve() {
                go func() {
                        term, err := l.handleConn(conn)
                        if err != nil {
-                               logger.Printf("Failed to handshake: %v", err)
+                               logger.Printf("[%s] Failed to handshake: %s", conn.RemoteAddr(), err)
                                return
                        }
                        l.HandlerFunc(term)