[opt] 支持pkg层面控制日志 #62

Makefile

@@ -20,7 +20,9 @@ image:
 
 .PHONY: clean
 clean:
-	rm -rf ./bin ./release ./logs ./lal_record
+	rm -rf ./bin ./release ./logs ./lal_record ./pkg/base/logs ./pkg/base/lal_record ./pkg/httpts/logs ./pkg/httpts/lal_record
+	rm -rf ./pkg/mpegts/logs ./pkg/mpegts/lal_record ./pkg/remux/logs ./pkg/remux/lal_record ./pkg/rtprtcp/logs ./pkg/rtprtcp/lal_record
+	rm -rf ./pkg/rtsp/logs ./pkg/rtsp/lal_record ./pkg/sdp/logs ./pkg/sdp/lal_record
 
 .PHONY: all
 all: build test

go.mod

@@ -2,4 +2,4 @@ module github.com/q191201771/lal
 
 go 1.14
 
-require github.com/q191201771/naza v0.29.0
+require github.com/q191201771/naza v0.30.0

go.sum

@@ -1,2 +1,2 @@
-github.com/q191201771/naza v0.29.0 h1:VvvJfYVkmQjszOXqhYyf2gGOCPl69woLCSWxNF0T//I=
-github.com/q191201771/naza v0.29.0/go.mod h1:n+dpJjQSh90PxBwxBNuifOwQttywvSIN5TkWSSYCeBk=
+github.com/q191201771/naza v0.30.0 h1:tfy1O0QRl3O80mH8PSAd2FhpZ5eL7coQtCF0HzjEO4Y=
+github.com/q191201771/naza v0.30.0/go.mod h1:n+dpJjQSh90PxBwxBNuifOwQttywvSIN5TkWSSYCeBk=

pkg/aac/aac_test.go

@@ -16,8 +16,6 @@ import (
 
 	"github.com/q191201771/lal/pkg/aac"
 
-	"github.com/q191201771/naza/pkg/nazalog"
-
 	"github.com/q191201771/naza/pkg/assert"
 )
 
@@ -90,5 +88,5 @@ func TestMakeAudioDataSeqHeader(t *testing.T) {
 func TestSequenceHeaderContext(t *testing.T) {
 	var shCtx aac.SequenceHeaderContext
 	shCtx.Unpack(goldenSh)
-	nazalog.Debugf("%+v", shCtx)
+	aac.Log.Debugf("%+v", shCtx)
 }

pkg/aac/var.go

@@ -0,0 +1,13 @@
+// Copyright 2022, Chef.  All rights reserved.
+// https://github.com/q191201771/lal
+//
+// Use of this source code is governed by a MIT-style license
+// that can be found in the License file.
+//
+// Author: Chef (191201771@qq.com)
+
+package aac
+
+import "github.com/q191201771/naza/pkg/nazalog"
+
+var Log = nazalog.GetGlobalLogger()

pkg/avc/avc.go

@@ -11,10 +11,8 @@ package avc
 import (
 	"io"
 
-	"github.com/q191201771/naza/pkg/nazabytes"
-	"github.com/q191201771/naza/pkg/nazalog"
-
 	"github.com/q191201771/lal/pkg/base"
+	"github.com/q191201771/naza/pkg/nazabytes"
 
 	"github.com/q191201771/naza/pkg/nazaerrors"
 
@@ -36,7 +34,7 @@ var (
 	NaluStartCode3 = []byte{0x0, 0x0, 0x1}
 	NaluStartCode4 = []byte{0x0, 0x0, 0x0, 0x1}
 
-	// aud nalu
+	// AudNalu aud nalu
 	AudNalu = []byte{0x00, 0x00, 0x00, 0x01, 0x09, 0xf0}
 )
 
@@ -498,7 +496,7 @@ func IterateNaluAvcc(nals []byte, handler func(nal []byte)) error {
 
 			// length为0的直接过滤掉
 			if length == 0 {
-				nazalog.Warnf("avcc nalu length equal 0. nals=%s", nazabytes.Prefix(nals, 128))
+				Log.Warnf("avcc nalu length equal 0. nals=%s", nazabytes.Prefix(nals, 128))
 				continue
 			}
 			handler(nals[pos:epos])
@@ -507,7 +505,7 @@ func IterateNaluAvcc(nals []byte, handler func(nal []byte)) error {
 			// 最后一个
 
 			if length == 0 {
-				nazalog.Warnf("avcc nalu length equal 0. nals=%s", nazabytes.Prefix(nals, 128))
+				Log.Warnf("avcc nalu length equal 0. nals=%s", nazabytes.Prefix(nals, 128))
 				continue
 			}
 			handler(nals[pos:epos])

pkg/avc/avc_test.go

@@ -18,8 +18,6 @@ import (
 	"github.com/q191201771/naza/pkg/nazabits"
 	"github.com/q191201771/naza/pkg/nazaerrors"
 
-	"github.com/q191201771/naza/pkg/nazalog"
-
 	"github.com/q191201771/lal/pkg/avc"
 
 	"github.com/q191201771/naza/pkg/assert"
@@ -36,7 +34,7 @@ func TestParseNaluType(t *testing.T) {
 		assert.Equal(t, out, actual)
 
 		b := avc.ParseNaluTypeReadable(in)
-		nazalog.Debug(b)
+		avc.Log.Debug(b)
 	}
 }
 
@@ -60,7 +58,7 @@ func TestParseSliceType(t *testing.T) {
 
 		b, err := avc.ParseSliceTypeReadable(item.in)
 		assert.Equal(t, nil, err)
-		nazalog.Debug(b)
+		avc.Log.Debug(b)
 	}
 }
 
@@ -138,7 +136,7 @@ func TestParseSps(t *testing.T) {
 	err = avc.ParseSps(nil, &ctx)
 	assert.Equal(t, true, nazaerrors.Is(err, nazabits.ErrNazaBits))
 	assert.IsNotNil(t, err)
-	nazalog.Debugf("error expected not nil, actual=%+v", err)
+	avc.Log.Debugf("error expected not nil, actual=%+v", err)
 
 	err = avc.ParseSps(goldenSps2, &ctx)
 	assert.Equal(t, nil, err)

pkg/avc/beta.go

@@ -18,14 +18,13 @@ import (
 	"github.com/q191201771/naza/pkg/bele"
 	"github.com/q191201771/naza/pkg/nazabits"
 	"github.com/q191201771/naza/pkg/nazabytes"
-	"github.com/q191201771/naza/pkg/nazalog"
 )
 
 func ParseSps(payload []byte, ctx *Context) error {
 	br := nazabits.NewBitReader(payload)
 	var sps Sps
 	if err := parseSpsBasic(&br, &sps); err != nil {
-		nazalog.Errorf("parseSpsBasic failed. err=%+v, payload=%s", err, hex.Dump(nazabytes.Prefix(payload, 128)))
+		Log.Errorf("parseSpsBasic failed. err=%+v, payload=%s", err, hex.Dump(nazabytes.Prefix(payload, 128)))
 		return err
 	}
 	ctx.Profile = sps.ProfileIdc
@@ -37,9 +36,9 @@ func ParseSps(payload []byte, ctx *Context) error {
 
 	if err := parseSpsGamma(&br, &sps); err != nil {
 		// 注意，这里不将错误返回给上层，因为可能是Beta自身解析的问题
-		nazalog.Errorf("parseSpsGamma failed. err=%+v, payload=%s", err, hex.Dump(nazabytes.Prefix(payload, 128)))
+		Log.Errorf("parseSpsGamma failed. err=%+v, payload=%s", err, hex.Dump(nazabytes.Prefix(payload, 128)))
 	}
-	nazalog.Debugf("sps=%+v", sps)
+	Log.Debugf("sps=%+v", sps)
 
 	ctx.Width = (sps.PicWidthInMbsMinusOne+1)*16 - (sps.FrameCropLeftOffset+sps.FrameCropRightOffset)*2
 	ctx.Height = (2-uint32(sps.FrameMbsOnlyFlag))*(sps.PicHeightInMapUnitsMinusOne+1)*16 - (sps.FrameCropTopOffset+sps.FrameCropBottomOffset)*2
@@ -94,7 +93,7 @@ func TryParseSeqHeader(payload []byte) error {
 	b, err = br.ReadBytes(2)
 	dcr.PpsLength = bele.BeUint16(b)
 
-	nazalog.Debugf("%+v", dcr)
+	Log.Debugf("%+v", dcr)
 
 	// 5 + 5 + 1 + 2
 	var ctx Context

pkg/avc/var.go

@@ -0,0 +1,13 @@
+// Copyright 2022, Chef.  All rights reserved.
+// https://github.com/q191201771/lal
+//
+// Use of this source code is governed by a MIT-style license
+// that can be found in the License file.
+//
+// Author: Chef (191201771@qq.com)
+
+package avc
+
+import "github.com/q191201771/naza/pkg/nazalog"
+
+var Log = nazalog.GetGlobalLogger()

pkg/base/base.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/q191201771/naza/pkg/bininfo"
-	"github.com/q191201771/naza/pkg/nazalog"
 )
 
 // base包提供被其他多个package依赖的基础内容，自身不依赖任何package
@@ -33,13 +32,13 @@ func ReadableNowTime() string {
 
 func LogoutStartInfo() {
 	dir, _ := os.Getwd()
-	nazalog.Infof("     start: %s", startTime)
-	nazalog.Infof("        wd: %s", dir)
-	nazalog.Infof("      args: %s", strings.Join(os.Args, " "))
-	nazalog.Infof("   bininfo: %s", bininfo.StringifySingleLine())
-	nazalog.Infof("   version: %s", LalFullInfo)
-	nazalog.Infof("    github: %s", LalGithubSite)
-	nazalog.Infof("       doc: %s", LalDocSite)
+	Log.Infof("     start: %s", startTime)
+	Log.Infof("        wd: %s", dir)
+	Log.Infof("      args: %s", strings.Join(os.Args, " "))
+	Log.Infof("   bininfo: %s", bininfo.StringifySingleLine())
+	Log.Infof("   version: %s", LalFullInfo)
+	Log.Infof("    github: %s", LalGithubSite)
+	Log.Infof("       doc: %s", LalDocSite)
 }
 
 func init() {

pkg/base/http_server_test.go

@@ -16,11 +16,11 @@ func TestHttpServerManager(t *testing.T) {
 	//var err error
 	//
 	//var fnFlv = func(writer http.ResponseWriter, request *http.Request) {
-	//	nazalog.Debugf("> fnFlv")
+	//	Log.Debugf("> fnFlv")
 	//}
 	//
 	//var fnTs = func(writer http.ResponseWriter, request *http.Request) {
-	//	nazalog.Debugf("> fnTs")
+	//	Log.Debugf("> fnTs")
 	//}
 	//
 	//sm := NewHttpServerManager()

pkg/base/http_sub_session.go

@@ -118,7 +118,7 @@ func (session *HttpSubSession) StreamName() string {
 	case ProtocolHttpts:
 		suffix = ".ts"
 	default:
-		Logger.Warnf("[%s] acquire stream name but protocol unknown.", session.Uk)
+		Log.Warnf("[%s] acquire stream name but protocol unknown.", session.Uk)
 	}
 	return strings.TrimSuffix(session.UrlCtx.LastItemOfPath, suffix)
 }

pkg/base/log.go

@@ -15,6 +15,7 @@ import (
 )
 
 type LogDump struct {
+	log         nazalog.Logger
 	debugMaxNum int
 
 	debugCount int
@@ -24,14 +25,15 @@ type LogDump struct {
 //
 // @param debugMaxNum: 日志最小级别为debug时，使用debug打印日志次数的阈值
 //
-func NewLogDump(debugMaxNum int) LogDump {
+func NewLogDump(log nazalog.Logger, debugMaxNum int) LogDump {
 	return LogDump{
+		log:         log,
 		debugMaxNum: debugMaxNum,
 	}
 }
 
 func (ld *LogDump) ShouldDump() bool {
-	switch nazalog.GetOption().Level {
+	switch ld.log.GetOption().Level {
 	case nazalog.LevelTrace:
 		return true
 	case nazalog.LevelDebug:
@@ -52,5 +54,5 @@ func (ld *LogDump) ShouldDump() bool {
 // 这个hex.Dump调用
 //
 func (ld *LogDump) Outf(format string, v ...interface{}) {
-	nazalog.Out(nazalog.GetOption().Level, 3, fmt.Sprintf(format, v...))
+	ld.log.Out(ld.log.GetOption().Level, 3, fmt.Sprintf(format, v...))
 }

pkg/base/merge_writer.go

@@ -10,8 +10,6 @@ package base
 
 import (
 	"net"
-
-	"github.com/q191201771/naza/pkg/nazalog"
 )
 
 // TODO(chef): feat 通过时间戳（目前是数据大小）来设定合并阈值
@@ -47,7 +45,7 @@ func NewMergeWriter(onWritev OnWritev, size int) *MergeWriter {
 // 注意，函数调用结束后，`b`内存块会被内部持有
 //
 func (w *MergeWriter) Write(b []byte) {
-	nazalog.Debugf("[%p] MergeWriter::Write. len=%d", w, len(b))
+	Log.Debugf("[%p] MergeWriter::Write. len=%d", w, len(b))
 	w.bs = append(w.bs, b)
 	w.currSize += len(b)
 	if w.currSize >= w.size {
@@ -58,7 +56,7 @@ func (w *MergeWriter) Write(b []byte) {
 // Flush 强制将内部缓冲的数据全部回调排空
 //
 func (w *MergeWriter) Flush() {
-	nazalog.Debugf("[%p] MergeWriter::Flush.", w)
+	Log.Debugf("[%p] MergeWriter::Flush.", w)
 	if w.currSize > 0 {
 		w.flush()
 	}
@@ -74,7 +72,7 @@ func (w *MergeWriter) flush() {
 		n += len(v)
 		ns = append(ns, len(v))
 	}
-	nazalog.Debugf("[%p] MergeWriter::flush. len=%d(%v)", w, n, ns)
+	Log.Debugf("[%p] MergeWriter::flush. len=%d(%v)", w, n, ns)
 	w.onWritev(w.bs)
 	w.currSize = 0
 	w.bs = nil

pkg/base/signal_unix.go

@@ -14,8 +14,6 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
-
-	log "github.com/q191201771/naza/pkg/nazalog"
 )
 
 // RunSignalHandler 监听SIGUSR1和SIGUSR2信号并回调
@@ -26,6 +24,6 @@ func RunSignalHandler(cb func()) {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, syscall.SIGUSR1, syscall.SIGUSR2)
 	s := <-c
-	log.Infof("recv signal. s=%+v", s)
+	Log.Infof("recv signal. s=%+v", s)
 	cb()
 }

pkg/base/var.go

@@ -10,6 +10,4 @@ package base
 
 import "github.com/q191201771/naza/pkg/nazalog"
 
-var (
-	Logger = nazalog.GetGlobalLogger()
-)
+var Log = nazalog.GetGlobalLogger()

pkg/hevc/hevc.go

@@ -173,7 +173,7 @@ func ParseVpsSpsPpsFromSeqHeaderWithoutMalloc(payload []byte) (vps, sps, pps []b
 	if payload[0] != 0x1c || payload[1] != 0x00 || payload[2] != 0 || payload[3] != 0 || payload[4] != 0 {
 		return nil, nil, nil, nazaerrors.Wrap(base.ErrHevc)
 	}
-	//nazalog.Debugf("%s", hex.Dump(payload))
+	//Log.Debugf("%s", hex.Dump(payload))
 
 	if len(payload) < 33 {
 		return nil, nil, nil, nazaerrors.Wrap(base.ErrHevc)

pkg/hevc/var.go

@@ -0,0 +1,13 @@
+// Copyright 2022, Chef.  All rights reserved.
+// https://github.com/q191201771/lal
+//
+// Use of this source code is governed by a MIT-style license
+// that can be found in the License file.
+//
+// Author: Chef (191201771@qq.com)
+
+package hevc
+
+import "github.com/q191201771/naza/pkg/nazalog"
+
+var Log = nazalog.GetGlobalLogger()