diff --git a/internal/version/update.go b/internal/version/update.go index 6880517..0faba37 100644 --- a/internal/version/update.go +++ b/internal/version/update.go @@ -18,7 +18,7 @@ func SelfUpdate(ctx context.Context, url string) error { log.Errorf("self update: get current executable file error: %v", err) return err } - log.Infof("self update: current executable file: %s", currentExecFile) + log.Debugf("self update: current executable file: %s", currentExecFile) tmp := filepath.Join(os.TempDir(), "synctv-server", fmt.Sprintf("self-update-%d", now)) if err := os.MkdirAll(tmp, 0755); err != nil { @@ -43,30 +43,31 @@ func SelfUpdate(ctx context.Context, url string) error { log.Errorf("self update: chmod %s error: %v", file, err) return err } - log.Infof("self update: chmod success: %s", file) + log.Debugf("self update: chmod success: %s", file) oldName := fmt.Sprintf("%s-%d.old", currentExecFile, now) if err := os.Rename(currentExecFile, oldName); err != nil { log.Errorf("self update: rename %s -> %s error: %v", currentExecFile, oldName, err) return err } - log.Infof("self update: rename success: %s -> %s", currentExecFile, oldName) + log.Debugf("self update: rename success: %s -> %s", currentExecFile, oldName) defer func() { if err != nil { - log.Infof("self update: rollback: %s -> %s", oldName, currentExecFile) + log.Warnf("self update: rollback: %s -> %s", oldName, currentExecFile) if err := os.Rename(oldName, currentExecFile); err != nil { log.Errorf("self update: rollback: rename %s -> %s error: %v", oldName, currentExecFile, err) } } else { - log.Infof("self update: remove old executable file: %s", oldName) + log.Debugf("self update: remove old executable file: %s", oldName) if err := os.Remove(oldName); err != nil { log.Warnf("self update: remove old executable file error: %v", err) } } }() - if err := os.Rename(file, currentExecFile); err != nil { + err = os.Rename(file, currentExecFile) + if err != nil { log.Errorf("self update: rename %s -> %s error: %v", file, currentExecFile, err) return err } diff --git a/room/hub.go b/room/hub.go index eb27226..0c6075f 100644 --- a/room/hub.go +++ b/room/hub.go @@ -8,7 +8,6 @@ import ( "github.com/gorilla/websocket" log "github.com/sirupsen/logrus" - "github.com/synctv-org/synctv/cmd/flags" "github.com/synctv-org/synctv/utils" "github.com/zijiren233/gencontainer/rwmap" ) @@ -88,26 +87,22 @@ func (h *hub) Serve() error { return true } if err := cli.Send(message.data); err != nil { - if flags.Dev { - log.Errorf("hub: %s, write to client err: %s\nmessage: %+v", h.id, err, message) - } + log.Debugf("hub: %s, write to client err: %s\nmessage: %+v", h.id, err, message) cli.Close() } return true }) case <-h.exit: - log.Infof("hub: %s, closed", h.id) + log.Debugf("hub: %s, closed", h.id) return nil } } } func (h *hub) devMessage(msg Message) { - if flags.Dev { - switch msg.MessageType() { - case websocket.TextMessage: - log.Infof("hub: %s, broadcast:\nmessage: %+v", h.id, msg.String()) - } + switch msg.MessageType() { + case websocket.TextMessage: + log.Debugf("hub: %s, broadcast:\nmessage: %+v", h.id, msg.String()) } } diff --git a/server/handlers/init.go b/server/handlers/init.go index eb4bfb9..93f8a56 100644 --- a/server/handlers/init.go +++ b/server/handlers/init.go @@ -23,13 +23,13 @@ func Init(e *gin.Engine, s *rtmps.Server, r *room.Rooms) { return "", "", err } if !r.HasRoom(ReqAppName) { - log.Infof("rtmp: publish to %s/%s error: %s", ReqAppName, channelName, fmt.Sprintf("room %s not exist", ReqAppName)) + log.Warnf("rtmp: publish to %s/%s error: %s", ReqAppName, channelName, fmt.Sprintf("room %s not exist", ReqAppName)) return "", "", fmt.Errorf("room %s not exist", ReqAppName) } - log.Infof("rtmp: publish to success: %s/%s", ReqAppName, channelName) + log.Infof("rtmp: publisher login success: %s/%s", ReqAppName, channelName) return ReqAppName, channelName, nil } else if !conf.Conf.Rtmp.RtmpPlayer { - log.Infof("rtmp: dial to %s/%s error: %s", ReqAppName, ReqChannelName, "rtmp player is not enabled") + log.Warnf("rtmp: dial to %s/%s error: %s", ReqAppName, ReqChannelName, "rtmp player is not enabled") return "", "", fmt.Errorf("rtmp: dial to %s/%s error: %s", ReqAppName, ReqChannelName, "rtmp player is not enabled") } return ReqAppName, ReqChannelName, nil diff --git a/server/handlers/room.go b/server/handlers/room.go index 66b744a..11facc5 100644 --- a/server/handlers/room.go +++ b/server/handlers/room.go @@ -169,7 +169,7 @@ func NewCreateRoomHandler(s *rtmps.Server) gin.HandlerFunc { var pre int64 = 0 for range ticker.C { if r.Closed() { - log.Infof("ws: room %s closed, stop broadcast people num", r.ID()) + log.Debugf("ws: room %s closed, stop broadcast people num", r.ID()) return } current := r.ClientNum() diff --git a/server/handlers/websocket.go b/server/handlers/websocket.go index 3d10379..a5ea694 100644 --- a/server/handlers/websocket.go +++ b/server/handlers/websocket.go @@ -9,7 +9,6 @@ import ( "github.com/gorilla/websocket" json "github.com/json-iterator/go" log "github.com/sirupsen/logrus" - "github.com/synctv-org/synctv/cmd/flags" pb "github.com/synctv-org/synctv/proto" "github.com/synctv-org/synctv/room" "github.com/synctv-org/synctv/utils" @@ -62,16 +61,12 @@ func handleWriterMessage(c *room.Client) error { for v := range c.GetReadChan() { wc, err := c.NextWriter(v.MessageType()) if err != nil { - if flags.Dev { - log.Errorf("ws: room %s user %s get next writer error: %v", c.Room().ID(), c.Username(), err) - } + log.Debugf("ws: room %s user %s get next writer error: %v", c.Room().ID(), c.Username(), err) return err } if err := v.Encode(wc); err != nil { - if flags.Dev { - log.Errorf("ws: room %s user %s encode message error: %v", c.Room().ID(), c.Username(), err) - } + log.Debugf("ws: room %s user %s encode message error: %v", c.Room().ID(), c.Username(), err) continue } if err := wc.Close(); err != nil { @@ -87,17 +82,13 @@ func handleReaderMessage(c *room.Client) error { for { t, rd, err := c.NextReader() if err != nil { - if flags.Dev { - log.Errorf("ws: room %s user %s get next reader error: %v", c.Room().ID(), c.Username(), err) - } + log.Debugf("ws: room %s user %s get next reader error: %v", c.Room().ID(), c.Username(), err) return err } - log.Infof("ws: room %s user %s receive message type: %d", c.Room().ID(), c.Username(), t) + log.Debugf("ws: room %s user %s receive message type: %d", c.Room().ID(), c.Username(), t) switch t { case websocket.CloseMessage: - if flags.Dev { - log.Infof("ws: room %s user %s receive close message", c.Room().ID(), c.Username()) - } + log.Debugf("ws: room %s user %s receive close message", c.Room().ID(), c.Username()) return nil case websocket.BinaryMessage: var data []byte @@ -145,9 +136,7 @@ func handleReaderMessage(c *room.Client) error { log.Errorf("ws: room %s user %s receive unknown message type: %d", c.Room().ID(), c.Username(), t) continue } - if flags.Dev { - log.Infof("ws: receive room %s user %s message: %+v", c.Room().ID(), c.Username(), msg.String()) - } + log.Debugf("ws: receive room %s user %s message: %+v", c.Room().ID(), c.Username(), msg.String()) switch t { case websocket.BinaryMessage: err = handleElementMsg(c.Room(), &msg, func(em *pb.ElementMessage) error {