Make Message an interface with attached handling behavior.

This commit is contained in:
Jeremy Latt 2012-04-17 18:16:57 -07:00
parent d1f8c7657b
commit fed72a7aa3
6 changed files with 190 additions and 96 deletions

View file

@ -7,18 +7,23 @@ import (
"net"
)
func readTrimmedLine(reader *bufio.Reader) (string, error) {
line, err := reader.ReadString('\n')
return strings.TrimSpace(line), err
}
// Adapt `net.Conn` to a `chan string`.
func StringReadChan(conn net.Conn) chan string {
func StringReadChan(conn net.Conn) <-chan string {
ch := make(chan string)
reader := bufio.NewReader(conn)
go func() {
for {
line, err := reader.ReadString('\n')
line, err := readTrimmedLine(reader)
if (line != "") {
ch <- strings.TrimSpace(line)
ch <- line
log.Printf("%s -> %s", conn.RemoteAddr(), line)
}
if err != nil {
log.Print("StringReadChan[read]: ", err)
break
}
}
@ -27,16 +32,16 @@ func StringReadChan(conn net.Conn) chan string {
return ch
}
func StringWriteChan(conn net.Conn) chan string {
func StringWriteChan(conn net.Conn) chan<- string {
ch := make(chan string)
writer := bufio.NewWriter(conn)
go func() {
for str := range ch {
if _, err := writer.WriteString(str + "\r\n"); err != nil {
log.Print("StringWriteChan[write]: ", err)
break
}
writer.Flush()
log.Printf("%s <- %s", conn.RemoteAddr(), str)
}
close(ch)
}()