mirror of
https://github.com/jeremyd/ergo.git
synced 2026-07-30 18:58:10 -07:00
implement join/quit and channel messages properly
This commit is contained in:
+6
-3
@@ -20,9 +20,12 @@ func StringReadChan(conn net.Conn) <-chan string {
|
||||
ch := make(chan string)
|
||||
reader := bufio.NewReader(conn)
|
||||
go func() {
|
||||
defer conn.Close()
|
||||
defer close(ch)
|
||||
for {
|
||||
line, err := readTrimmedLine(reader)
|
||||
if err != nil {
|
||||
log.Print("net: ", err)
|
||||
break
|
||||
}
|
||||
if DEBUG_NET {
|
||||
@@ -30,7 +33,6 @@ func StringReadChan(conn net.Conn) <-chan string {
|
||||
}
|
||||
ch <- line
|
||||
}
|
||||
close(ch)
|
||||
}()
|
||||
return ch
|
||||
}
|
||||
@@ -39,18 +41,19 @@ func StringWriteChan(conn net.Conn) chan<- string {
|
||||
ch := make(chan string)
|
||||
writer := bufio.NewWriter(conn)
|
||||
go func() {
|
||||
defer conn.Close()
|
||||
defer close(ch)
|
||||
for str := range ch {
|
||||
if DEBUG_NET {
|
||||
log.Printf("%s ← %s : %s", conn.RemoteAddr(), conn.LocalAddr(), str)
|
||||
}
|
||||
if _, err := writer.WriteString(str + "\r\n"); err != nil {
|
||||
log.Print("net: ", err)
|
||||
break
|
||||
}
|
||||
writer.Flush()
|
||||
}
|
||||
close(ch)
|
||||
}()
|
||||
|
||||
return ch
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user