Skip to content

Commit 7101674

Browse files
adwpcadwpc
committed
(Feat): new log
1 parent c7c987a commit 7101674

File tree

7 files changed

+11
-23
lines changed

7 files changed

+11
-23
lines changed

‎example/ion-cluster-simple/main.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ func init() {
2727
}
2828

2929
func main() {
30-
fixByFile := []string{"asm_amd64.s", "proc.go"}
31-
fixByFunc := []string{}
32-
log.Init("debug", fixByFile, fixByFunc)
30+
log.Init("debug")
3331

3432
// parse flag
3533
var session, addr string

‎example/ion-sfu-gstreamer-receive/main.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ func runClientLoop(addr, session string) {
9393

9494
func main() {
9595
// init log
96-
fixByFile := []string{"asm_amd64.s", "proc.go", "icegatherer.go"}
97-
fixByFunc := []string{"AddProducer", "NewClient"}
98-
log.Init("debug", fixByFile, fixByFunc)
96+
log.Init("debug")
9997

10098
// parse flag
10199
var session, addr string

‎example/ion-sfu-load-tool/main.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ func run(e *sdk.Engine, addr, session, file, role string, total, duration, cycle
5151
}
5252

5353
func main() {
54-
//init log
55-
fixByFile := []string{"asm_amd64.s", "proc.go", "icegatherer.go"}
56-
fixByFunc := []string{"AddProducer", "NewClient"}
57-
5854
//get args
5955
var session, gaddr, file, role, loglevel, simulcast, paddr string
6056
var total, cycle, duration int
@@ -73,7 +69,7 @@ func main() {
7369
flag.StringVar(&simulcast, "simulcast", "", "simulcast layer q|h|f")
7470
flag.StringVar(&paddr, "paddr", "", "pprof listening addr")
7571
flag.Parse()
76-
log.Init(loglevel, fixByFile, fixByFunc)
72+
log.Init(loglevel)
7773

7874
se := webrtc.SettingEngine{}
7975
se.SetEphemeralUDPPortRange(10000, 15000)

‎example/join-from-mediadevice/go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
211211
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
212212
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
213213
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
214+
github.com/lucsky/cuid v1.0.2 h1:z4XlExeoderxoPj2/dxKOyPxe9RCOu7yNq9/XWxIUMQ=
214215
github.com/lucsky/cuid v1.0.2/go.mod h1:QaaJqckboimOmhRSJXSx/+IT+VTfxfPGSo/6mfgUfmE=
215216
github.com/lxn/win v0.0.0-20201111105847-2a20daff6a55/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
216217
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
@@ -278,6 +279,7 @@ github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdO
278279
github.com/pion/dtls/v2 v2.0.6/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10=
279280
github.com/pion/dtls/v2 v2.0.7 h1:PNcUs/G1l9hb4jzMEorgFMxIBdp7fRN4LIApOTMtCYs=
280281
github.com/pion/dtls/v2 v2.0.7/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10=
282+
github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg=
281283
github.com/pion/dtls/v2 v2.0.8/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10=
282284
github.com/pion/ice/v2 v2.0.15 h1:KZrwa2ciL9od8+TUVJiYTNsCW9J5lktBjGwW1MacEnQ=
283285
github.com/pion/ice/v2 v2.0.15/go.mod h1:ZIiVGevpgAxF/cXiIVmuIUtCb3Xs4gCzCbXB6+nFkSI=
@@ -287,6 +289,7 @@ github.com/pion/ion-log v1.0.0 h1:2lJLImCmfCWCR38hLWsjQfBWe6NFz/htbqiYHwvOP/Q=
287289
github.com/pion/ion-log v1.0.0/go.mod h1:jwcla9KoB9bB/4FxYDSRJPcPYSLp5XiUUMnOLaqwl4E=
288290
github.com/pion/ion-sdk-go v0.4.5 h1:o/DbYOq2Y/pt2Y92NHvin+IvXDW3Tgy3efX4dQhYxR0=
289291
github.com/pion/ion-sdk-go v0.4.5/go.mod h1:nJcg57VG0svZDNtdkKdHWt8IfD9H4+MceSqcibaOchs=
292+
github.com/pion/ion-sfu v1.9.4-0.20210304193051-6b6be58a1c9b h1:jdeshI6fJVKvSN8Bh1Ii5vZW9xoRH4NBJVD0fD6z3vw=
290293
github.com/pion/ion-sfu v1.9.4-0.20210304193051-6b6be58a1c9b/go.mod h1:BQf2nidxkQU5Qc37e13i+rc7Q+qt8CWp0HmYtsy00o8=
291294
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
292295
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
@@ -527,6 +530,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
527530
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
528531
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
529532
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
533+
golang.org/x/sys v0.0.0-20210217090653-ed5674b6da4a h1:m4knbKtdWq+rPB3TE+ApaRzkETZngkKdhYjvTnnRq4s=
530534
golang.org/x/sys v0.0.0-20210217090653-ed5674b6da4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
531535
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
532536
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

‎example/join-from-mediadevice/main.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,23 @@ import (
66

77
log "github.com/pion/ion-log"
88
sdk "github.com/pion/ion-sdk-go"
9-
"github.com/pion/webrtc/v3"
109
"github.com/pion/mediadevices"
1110
"github.com/pion/mediadevices/pkg/codec/vpx"
1211
"github.com/pion/mediadevices/pkg/frame"
1312
"github.com/pion/mediadevices/pkg/prop"
13+
"github.com/pion/webrtc/v3"
1414

1515
// Note: If you don't have a camera or microphone or your adapters are not supported,
1616
// you can always swap your adapters with our dummy adapters below.
1717
// _ "github.com/pion/mediadevices/pkg/driver/videotest"
1818
// _ "github.com/pion/mediadevices/pkg/driver/audiotest"
1919
_ "github.com/pion/mediadevices/pkg/driver/camera" // This is required to register camera adapter
2020
_ "github.com/pion/mediadevices/pkg/driver/microphone" // This is required to register microphone adapter
21-
2221
)
2322

2423
func main() {
2524
// init log
26-
fixByFile := []string{"asm_amd64.s", "proc.go", "icegatherer.go"}
27-
fixByFunc := []string{"AddProducer", "NewClient"}
28-
log.Init("debug", fixByFile, fixByFunc)
25+
log.Init("debug")
2926

3027
// parse flag
3128
var session, addr string
@@ -75,7 +72,6 @@ func main() {
7572
panic(err)
7673
}
7774

78-
7975
vpxParams, err := vpx.NewVP8Params()
8076
if err != nil {
8177
panic(err)

‎example/simple/main.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ func saveToDisk(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) {
4444

4545
func main() {
4646
// init log
47-
fixByFile := []string{"asm_amd64.s", "proc.go", "icegatherer.go"}
48-
fixByFunc := []string{"AddProducer", "NewClient"}
49-
log.Init("debug", fixByFile, fixByFunc)
47+
log.Init("debug")
5048

5149
// parse flag
5250
var session, addr, file string

‎example/track-to-rtp/main.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ func trackToRTP(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) {
119119

120120
func main() {
121121
// init log
122-
fixByFile := []string{"asm_amd64.s", "proc.go", "icegatherer.go"}
123-
fixByFunc := []string{"AddProducer", "NewClient"}
124-
log.Init("debug", fixByFile, fixByFunc)
122+
log.Init("debug")
125123

126124
// parse flag
127125
var session, addr, file string

0 commit comments

Comments
 (0)