Improve log information. Fix message handling location

yutopp · Jul 18, 2018 · 22aef0a · 22aef0a
1 parent f7db527
commit 22aef0a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/control_stream_handler.go b/control_stream_handler.go
@@ -71,17 +71,8 @@ func (h *controlStreamHandler) handleConnect(chunkStreamID int, timestamp uint32
 		cmdMsg = &msg.CommandMessage
 		goto handleCommand
 
-	case *message.SetChunkSize:
-		l.Infof("SetChunkSize: Msg = %+v", msg)
-		return h.conn.streamer.PeerState().SetChunkSize(msg.ChunkSize)
-
-	case *message.WinAckSize:
-		l.Infof("WinAckSize: Msg = %+v", msg)
-
-		return h.conn.streamer.PeerState().SetAckWindowSize(msg.Size)
-
 	default:
-		l.Warnf("Message unhandled: Msg = %+v", msg)
+		l.Warnf("Message unhandled: Msg = %#v", msg)
 
 		return nil
 	}
@@ -137,7 +128,7 @@ handleCommand:
 				},
 			}
 		})
-		l.Infof("Conn: %+v", m.(*message.CommandMessageAMF0).Command)
+		l.Infof("Conn: %#v", m.(*message.CommandMessageAMF0).Command)
 
 		if err := stream.Write(chunkStreamID, timestamp, m); err != nil {
 			return err
@@ -149,7 +140,7 @@ handleCommand:
 		return nil
 
 	default:
-		l.Warnf("Unexpected command: Command = %+v", cmdMsg)
+		l.Warnf("Unexpected command: Command = %#v", cmdMsg)
 
 		return nil
 	}
@@ -175,16 +166,25 @@ func (h *controlStreamHandler) handleCreateStream(chunkStreamID int, timestamp u
 		cmdMsg = &msg.CommandMessage
 		goto handleCommand
 
+	case *message.SetChunkSize:
+		l.Infof("Handle SetChunkSize: Msg = %#v", msg)
+		return h.conn.streamer.PeerState().SetChunkSize(msg.ChunkSize)
+
+	case *message.WinAckSize:
+		l.Infof("Handle WinAckSize: Msg = %#v", msg)
+
+		return h.conn.streamer.PeerState().SetAckWindowSize(msg.Size)
+
 	default:
-		l.Warnf("Message unhandled: Msg = %+v", msg)
+		l.Warnf("Message unhandled: Msg = %#v", msg)
 
 		return nil
 	}
 
 handleCommand:
 	switch cmd := cmdMsg.Command.(type) {
 	case *message.NetConnectionCreateStream:
-		l.Infof("Stream creating...: %+v", cmd)
+		l.Infof("Stream creating...: %#v", cmd)
 
 		if err := h.conn.handler.OnCommand(timestamp, cmd); err != nil {
 			return err
@@ -197,7 +197,7 @@ handleCommand:
 		})
 		if err != nil {
 			// TODO: send failed _result
-			l.Errorf("Stream creating...: Err = %+v", err)
+			l.Errorf("Stream creating...: Err = %#v", err)
 
 			return nil
 		}
@@ -239,7 +239,7 @@ handleCommand:
 		return nil
 
 	default:
-		l.Warnf("Unexpected command: Command = %+v", cmdMsg)
+		l.Warnf("Unexpected command: Command = %#v", cmdMsg)
 
 		return nil
 	}

diff --git a/data_stream_handler.go b/data_stream_handler.go
@@ -78,15 +78,15 @@ func (h *dataStreamHandler) handleAction(chunkStreamID int, timestamp uint32, ms
 		goto handleCommand
 
 	default:
-		l.Warnf("Message unhandled: Msg = %+v", msg)
+		l.Warnf("Message unhandled: Msg = %#v", msg)
 
 		return nil
 	}
 
 handleCommand:
 	switch cmd := cmdMsg.Command.(type) {
 	case *message.NetStreamPublish:
-		l.Infof("Publisher is comming: %+v", cmd)
+		l.Infof("Publisher is comming: %#v", cmd)
 
 		if err := h.conn.handler.OnCommand(timestamp, cmd); err != nil {
 			return err
@@ -116,7 +116,7 @@ handleCommand:
 		return nil
 
 	default:
-		l.Warnf("Unexpected command: Command = %+v", cmdMsg)
+		l.Warnf("Unexpected command: Command = %#v", cmdMsg)
 
 		return nil
 	}
@@ -146,7 +146,7 @@ func (h *dataStreamHandler) handlePublisher(chunkStreamID int, timestamp uint32,
 		goto handleCommand
 
 	default:
-		l.Warnf("Message unhandled: Msg = %+v", msg)
+		l.Warnf("Message unhandled: Msg = %#v", msg)
 
 		return nil
 	}
@@ -161,7 +161,7 @@ handleCommand:
 		return h.conn.handler.OnData(timestamp, df)
 
 	default:
-		l.Warnf("Ignore unknown data message: Msg = %+v", dataMsg)
+		l.Warnf("Ignore unknown data message: Msg = %#v", dataMsg)
 
 		return nil
 	}