third-party-mirrors/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-04-13 07:37:17 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Petrov 2016-08-13 16:22:43 -04:00
parent 1b7af5e559
commit 398cd75c5e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
host.go
View File

@ -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

4
sshd/net.go
View File

@ -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)