GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00
Code Issues Projects Releases Wiki Activity

simplify net logging

Browse Source
This commit is contained in:
Jeremy Latt 2014-02-13 18:11:32 -08:00
parent 965d8efdf8
commit ce931b23a2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
irc/client.go
View File

@ -35,7 +35,7 @@ func NewClient(server *Server, conn net.Conn) *Client {
client := &Client{ client := &Client{
channels: make(ChannelSet), channels: make(ChannelSet),
conn: conn, conn: conn,
hostname: IPString(conn.RemoteAddr()), hostname: AddrLookupHostname(conn.RemoteAddr()),
replies: make(chan Reply), replies: make(chan Reply),
server: server, server: server,
} }
@ -91,9 +91,9 @@ func (c *Client) readConn() {
if err != nil { if err != nil {
if DEBUG_NET { if DEBUG_NET {
if err == io.EOF { if err == io.EOF {
log.Printf("%s → %s closed", c.conn.RemoteAddr(), c.conn.LocalAddr()) log.Printf("%s → closed", c.conn.RemoteAddr())
} else { } else {
log.Printf("%s → %s error: %s", c.conn.RemoteAddr(), c.conn.LocalAddr(), err) log.Printf("%s → error: %s", c.conn.RemoteAddr(), err)
} }
} }
break break
@ -101,7 +101,7 @@ func (c *Client) readConn() {
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if DEBUG_NET { if DEBUG_NET {
log.Printf("%s → %s %s", c.conn.RemoteAddr(), c.conn.LocalAddr(), line) log.Printf("%s → %s", c.conn.RemoteAddr(), line)
} }
m, err := ParseCommand(line) m, err := ParseCommand(line)
@ -125,9 +125,9 @@ func (client *Client) maybeLogWriteError(err error) bool {
if err != nil { if err != nil {
if DEBUG_NET { if DEBUG_NET {
if err == io.EOF { if err == io.EOF {
log.Printf("%s ← %s closed", client.conn.RemoteAddr(), client.conn.LocalAddr()) log.Printf("%s ← closed", client.conn.RemoteAddr())
} else { } else {
log.Printf("%s ← %s error: %s", client.conn.RemoteAddr(), client.conn.LocalAddr(), err) log.Printf("%s ← error: %s", client.conn.RemoteAddr(), err)
} }
} }
return true return true
@ -144,7 +144,7 @@ func (client *Client) writeConn() {
} }
for _, str := range reply.Format(client) { for _, str := range reply.Format(client) {
if DEBUG_NET { if DEBUG_NET {
log.Printf("%s ← %s %s", client.conn.RemoteAddr(), client.conn.LocalAddr(), str) log.Printf("%s ← %s", client.conn.RemoteAddr(), str)
} }
if _, err := send.WriteString(str); client.maybeLogWriteError(err) { if _, err := send.WriteString(str); client.maybeLogWriteError(err) {
break break