aiden
/
synctv
mirror of https://github.com/synctv-org/synctv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Opt: debug log

Browse Source
pull/21/head
zijiren233 2 years ago
parent 3bedc6ed41
commit e3f1cf893d
5 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File

13
internal/version/update.go
Unescape Escape View File

@ -18,7 +18,7 @@ func SelfUpdate(ctx context.Context, url string) error {
log.Errorf("self update: get current executable file error: %v", err) log.Errorf("self update: get current executable file error: %v", err)
return 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)) tmp := filepath.Join(os.TempDir(), "synctv-server", fmt.Sprintf("self-update-%d", now))
if err := os.MkdirAll(tmp, 0755); err != nil { 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) log.Errorf("self update: chmod %s error: %v", file, err)
return 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) oldName := fmt.Sprintf("%s-%d.old", currentExecFile, now)
if err := os.Rename(currentExecFile, oldName); err != nil { if err := os.Rename(currentExecFile, oldName); err != nil {
log.Errorf("self update: rename %s -> %s error: %v", currentExecFile, oldName, err) log.Errorf("self update: rename %s -> %s error: %v", currentExecFile, oldName, err)
return 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() { defer func() {
if err != nil { 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 { if err := os.Rename(oldName, currentExecFile); err != nil {
log.Errorf("self update: rollback: rename %s -> %s error: %v", oldName, currentExecFile, err) log.Errorf("self update: rollback: rename %s -> %s error: %v", oldName, currentExecFile, err)
} }
} else { } 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 { if err := os.Remove(oldName); err != nil {
log.Warnf("self update: remove old executable file error: %v", err) 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) log.Errorf("self update: rename %s -> %s error: %v", file, currentExecFile, err)
return err return err
} }

15
room/hub.go
Unescape Escape View File

@ -8,7 +8,6 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/synctv-org/synctv/cmd/flags"
"github.com/synctv-org/synctv/utils" "github.com/synctv-org/synctv/utils"
"github.com/zijiren233/gencontainer/rwmap" "github.com/zijiren233/gencontainer/rwmap"
) )
@ -88,26 +87,22 @@ func (h *hub) Serve() error {
return true return true
} }
if err := cli.Send(message.data); err != nil { if err := cli.Send(message.data); err != nil {
if flags.Dev { log.Debugf("hub: %s, write to client err: %s\nmessage: %+v", h.id, err, message)
log.Errorf("hub: %s, write to client err: %s\nmessage: %+v", h.id, err, message)
}
cli.Close() cli.Close()
} }
return true return true
}) })
case <-h.exit: case <-h.exit:
log.Infof("hub: %s, closed", h.id) log.Debugf("hub: %s, closed", h.id)
return nil return nil
} }
} }
} }
func (h *hub) devMessage(msg Message) { func (h *hub) devMessage(msg Message) {
if flags.Dev { switch msg.MessageType() {
switch msg.MessageType() { case websocket.TextMessage:
case websocket.TextMessage: log.Debugf("hub: %s, broadcast:\nmessage: %+v", h.id, msg.String())
log.Infof("hub: %s, broadcast:\nmessage: %+v", h.id, msg.String())
}
} }
} }

6
server/handlers/init.go
Unescape Escape View File

@ -23,13 +23,13 @@ func Init(e *gin.Engine, s *rtmps.Server, r *room.Rooms) {
return "", "", err return "", "", err
} }
if !r.HasRoom(ReqAppName) { 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) 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 return ReqAppName, channelName, nil
} else if !conf.Conf.Rtmp.RtmpPlayer { } 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 "", "", fmt.Errorf("rtmp: dial to %s/%s error: %s", ReqAppName, ReqChannelName, "rtmp player is not enabled")
} }
return ReqAppName, ReqChannelName, nil return ReqAppName, ReqChannelName, nil

2
server/handlers/room.go
Unescape Escape View File

@ -169,7 +169,7 @@ func NewCreateRoomHandler(s *rtmps.Server) gin.HandlerFunc {
var pre int64 = 0 var pre int64 = 0
for range ticker.C { for range ticker.C {
if r.Closed() { 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 return
} }
current := r.ClientNum() current := r.ClientNum()

23
server/handlers/websocket.go
Unescape Escape View File

@ -9,7 +9,6 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
json "github.com/json-iterator/go" json "github.com/json-iterator/go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/synctv-org/synctv/cmd/flags"
pb "github.com/synctv-org/synctv/proto" pb "github.com/synctv-org/synctv/proto"
"github.com/synctv-org/synctv/room" "github.com/synctv-org/synctv/room"
"github.com/synctv-org/synctv/utils" "github.com/synctv-org/synctv/utils"
@ -62,16 +61,12 @@ func handleWriterMessage(c *room.Client) error {
for v := range c.GetReadChan() { for v := range c.GetReadChan() {
wc, err := c.NextWriter(v.MessageType()) wc, err := c.NextWriter(v.MessageType())
if err != nil { if err != nil {
if flags.Dev { log.Debugf("ws: room %s user %s get next writer error: %v", c.Room().ID(), c.Username(), err)
log.Errorf("ws: room %s user %s get next writer error: %v", c.Room().ID(), c.Username(), err)
}
return err return err
} }
if err := v.Encode(wc); err != nil { if err := v.Encode(wc); err != nil {
if flags.Dev { log.Debugf("ws: room %s user %s encode message error: %v", c.Room().ID(), c.Username(), err)
log.Errorf("ws: room %s user %s encode message error: %v", c.Room().ID(), c.Username(), err)
}
continue continue
} }
if err := wc.Close(); err != nil { if err := wc.Close(); err != nil {
@ -87,17 +82,13 @@ func handleReaderMessage(c *room.Client) error {
for { for {
t, rd, err := c.NextReader() t, rd, err := c.NextReader()
if err != nil { if err != nil {
if flags.Dev { log.Debugf("ws: room %s user %s get next reader error: %v", c.Room().ID(), c.Username(), err)
log.Errorf("ws: room %s user %s get next reader error: %v", c.Room().ID(), c.Username(), err)
}
return 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 { switch t {
case websocket.CloseMessage: case websocket.CloseMessage:
if flags.Dev { log.Debugf("ws: room %s user %s receive close message", c.Room().ID(), c.Username())
log.Infof("ws: room %s user %s receive close message", c.Room().ID(), c.Username())
}
return nil return nil
case websocket.BinaryMessage: case websocket.BinaryMessage:
var data []byte 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) log.Errorf("ws: room %s user %s receive unknown message type: %d", c.Room().ID(), c.Username(), t)
continue continue
} }
if flags.Dev { log.Debugf("ws: receive room %s user %s message: %+v", c.Room().ID(), c.Username(), msg.String())
log.Infof("ws: receive room %s user %s message: %+v", c.Room().ID(), c.Username(), msg.String())
}
switch t { switch t {
case websocket.BinaryMessage: case websocket.BinaryMessage:
err = handleElementMsg(c.Room(), &msg, func(em *pb.ElementMessage) error { err = handleElementMsg(c.Room(), &msg, func(em *pb.ElementMessage) error {

Write Preview
Loading…
Cancel
Save