Fix typos

protocol/api/api.go

@@ -226,7 +226,7 @@ func (s *Server) handlePull(w http.ResponseWriter, req *http.Request) {
 	log.Debugf("control pull: oper=%v, app=%v, name=%v, url=%v", oper, app, name, url)
 	if (len(app) <= 0) || (len(name) <= 0) || (len(url) <= 0) {
 		res.Status = 400
-		res.Data = "control push parameter error, please check them."
+		res.Data = "control pull parameter error, please check them."
 		return
 	}
 
@@ -243,23 +243,23 @@ func (s *Server) handlePull(w http.ResponseWriter, req *http.Request) {
 			res.Data = retString
 			return
 		}
-		log.Debugf("rtmprelay stop push %s from %s", remoteurl, localurl)
+		log.Debugf("rtmprelay stop pull %s from %s", remoteurl, localurl)
 		pullRtmprelay.Stop()
 
 		delete(s.session, keyString)
-		retString = fmt.Sprintf("<h1>push url stop %s ok</h1></br>", url)
+		retString = fmt.Sprintf("<h1>pull url stop %s ok</h1></br>", url)
 		res.Status = 400
 		res.Data = retString
 		log.Debugf("pull stop return %s", retString)
 	} else {
 		pullRtmprelay := rtmprelay.NewRtmpRelay(&localurl, &remoteurl)
-		log.Debugf("rtmprelay start push %s from %s", remoteurl, localurl)
+		log.Debugf("rtmprelay start pull %s from %s", remoteurl, localurl)
 		err = pullRtmprelay.Start()
 		if err != nil {
-			retString = fmt.Sprintf("push error=%v", err)
+			retString = fmt.Sprintf("pull error=%v", err)
 		} else {
 			s.session[keyString] = pullRtmprelay
-			retString = fmt.Sprintf("<h1>push url start %s ok</h1></br>", url)
+			retString = fmt.Sprintf("<h1>pull url start %s ok</h1></br>", url)
 		}
 		res.Status = 400
 		res.Data = retString

protocol/rtmp/rtmp.go

@@ -92,7 +92,7 @@ func (s *Server) Serve(listener net.Listener) (err error) {
 		}
 		conn := core.NewConn(netconn, 4*1024)
 		log.Debug("new client, connect remote: ", conn.RemoteAddr().String(),
-			"local:", conn.LocalAddr().String())
+			", local: ", conn.LocalAddr().String())
 		go s.handleConn(conn)
 	}
 }

protocol/rtmp/stream.go

@@ -166,7 +166,7 @@ func (s *Stream) StartStaticPush() {
 	streamname := key[index+1:]
 	appname := dscr[0]
 
-	log.Debugf("StartStaticPush: current streamname=%s， appname=%s", streamname, appname)
+	log.Debugf("StartStaticPush: current streamname=%s, appname=%s", streamname, appname)
 	pushurllist, err := rtmprelay.GetStaticPushList(appname)
 	if err != nil || len(pushurllist) < 1 {
 		log.Debugf("StartStaticPush: GetStaticPushList error=%v", err)
@@ -207,7 +207,7 @@ func (s *Stream) StopStaticPush() {
 	streamname := key[index+1:]
 	appname := dscr[0]
 
-	log.Debugf("StopStaticPush: current streamname=%s， appname=%s", streamname, appname)
+	log.Debugf("StopStaticPush: current streamname=%s, appname=%s", streamname, appname)
 	pushurllist, err := rtmprelay.GetStaticPushList(appname)
 	if err != nil || len(pushurllist) < 1 {
 		log.Debugf("StopStaticPush: GetStaticPushList error=%v", err)
@@ -239,7 +239,7 @@ func (s *Stream) IsSendStaticPush() bool {
 
 	appname := dscr[0]
 
-	//log.Debugf("SendStaticPush: current streamname=%s， appname=%s", streamname, appname)
+	//log.Debugf("SendStaticPush: current streamname=%s, appname=%s", streamname, appname)
 	pushurllist, err := rtmprelay.GetStaticPushList(appname)
 	if err != nil || len(pushurllist) < 1 {
 		//log.Debugf("SendStaticPush: GetStaticPushList error=%v", err)
@@ -285,7 +285,7 @@ func (s *Stream) SendStaticPush(packet av.Packet) {
 	streamname := key[index+1:]
 	appname := dscr[0]
 
-	//log.Debugf("SendStaticPush: current streamname=%s， appname=%s", streamname, appname)
+	//log.Debugf("SendStaticPush: current streamname=%s, appname=%s", streamname, appname)
 	pushurllist, err := rtmprelay.GetStaticPushList(appname)
 	if err != nil || len(pushurllist) < 1 {
 		//log.Debugf("SendStaticPush: GetStaticPushList error=%v", err)