commit c066b0e

Hubert Hirtz  ·  2020-08-16 13:53:44 +0000 UTC
parent 5103ded
irc: Simplify debug logging of incoming messages
1 files changed,  +4, -13
+4, -13
 1@@ -186,7 +186,6 @@ func NewSession(conn io.ReadWriteCloser, params SessionParams) (s Session, err e
 2 
 3 		for r.Scan() {
 4 			line := r.Text()
 5-			//fmt.Println(" > ", line)
 6 
 7 			msg, err := Tokenize(line)
 8 			if err != nil {
 9@@ -198,6 +197,9 @@ func NewSession(conn io.ReadWriteCloser, params SessionParams) (s Session, err e
10 				continue
11 			}
12 
13+			if s.debug {
14+				s.evts <- RawMessageEvent{Message: line}
15+			}
16 			s.msgs <- msg
17 		}
18 
19@@ -362,10 +364,6 @@ func (s *Session) run() {
20 }
21 
22 func (s *Session) handleStart(msg Message) (err error) {
23-	if s.debug {
24-		s.evts <- RawMessageEvent{Message: msg.String()}
25-	}
26-
27 	switch msg.Command {
28 	case "AUTHENTICATE":
29 		if s.auth != nil {
30@@ -459,20 +457,13 @@ func (s *Session) handleStart(msg Message) (err error) {
31 			return
32 		}
33 	default:
34-		err = s.handleInner(msg)
35+		err = s.handle(msg)
36 	}
37 
38 	return
39 }
40 
41 func (s *Session) handle(msg Message) (err error) {
42-	if s.debug {
43-		s.evts <- RawMessageEvent{Message: msg.String()}
44-	}
45-	return s.handleInner(msg)
46-}
47-
48-func (s *Session) handleInner(msg Message) (err error) {
49 	if id, ok := msg.Tags["batch"]; ok {
50 		if b, ok := s.chBatches[id]; ok {
51 			s.chBatches[id] = HistoryEvent{