Merge pull request #35 from jlatt/fix-goroutine-leak

fix two bugs

irc/socket.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"io"
 	"net"
-	"strings"
 )
 
 const (
@@ -15,14 +14,12 @@ const (
 
 type Socket struct {
 	conn   net.Conn
-	reader *bufio.Reader
 	writer *bufio.Writer
 }
 
 func NewSocket(conn net.Conn, commands chan<- Command) *Socket {
 	socket := &Socket{
 		conn:   conn,
-		reader: bufio.NewReader(conn),
 		writer: bufio.NewWriter(conn),
 	}
 
@@ -41,16 +38,11 @@ func (socket *Socket) Close() {
 }
 
 func (socket *Socket) readLines(commands chan<- Command) {
-	commands <- &ProxyCommand{
-		hostname: AddrLookupHostname(socket.conn.RemoteAddr()),
-	}
+	commands <- NewProxyCommand(AddrLookupHostname(socket.conn.RemoteAddr()))
 
-	for {
-		line, err := socket.reader.ReadString('\n')
-		if socket.isError(err, R) {
-			break
-		}
-		line = strings.TrimRight(line, CRLF)
+	scanner := bufio.NewScanner(socket.conn)
+	for scanner.Scan() {
+		line := scanner.Text()
 		if len(line) == 0 {
 			continue
 		}
@@ -64,9 +56,13 @@ func (socket *Socket) readLines(commands chan<- Command) {
 		commands <- msg
 	}
 
-	commands <- &QuitCommand{
-		message: "connection closed",
+	if err := scanner.Err(); err != nil {
+		Log.debug.Printf("%s error: %s", socket, err)
 	}
+
+	commands <- NewQuitCommand("connection closed")
+
+	close(commands)
 }
 
 func (socket *Socket) Write(line string) (err error) {