From 21b9896aa41d013a788438f159c1567dd18b84a1 Mon Sep 17 00:00:00 2001 From: David Colburn Date: Wed, 31 Jul 2024 14:06:55 -0400 Subject: [PATCH 1/2] update go-glib and go-gst --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8a926da2..ee2d0d40 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/chromedp/cdproto v0.0.0-20240421230201-ab917191657d github.com/chromedp/chromedp v0.9.5 github.com/frostbyte73/core v0.0.10 - github.com/go-gst/go-glib v1.0.1 - github.com/go-gst/go-gst v1.0.0 + github.com/go-gst/go-glib v1.1.0 + github.com/go-gst/go-gst v1.1.1-0.20240625092621-9195795a271e github.com/go-jose/go-jose/v3 v3.0.3 github.com/go-logr/logr v1.4.2 github.com/googleapis/gax-go/v2 v2.12.4 diff --git a/go.sum b/go.sum index 1e98a4f5..9c0b62e3 100644 --- a/go.sum +++ b/go.sum @@ -92,10 +92,10 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0= github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU= -github.com/go-gst/go-glib v1.0.1 h1:rsFmzANR9baTGTS7tX20PrBgMqKySAKYVCE+xbTKB8E= -github.com/go-gst/go-glib v1.0.1/go.mod h1:7Ehl6klsMBT94bf+Bic9qRyEkXARhhqpiZnU2PXeO6I= -github.com/go-gst/go-gst v1.0.0 h1:YBzE3JVZvbrnWWb/iGCXuiaOvHQ7HW+xXUBR++EgEtQ= -github.com/go-gst/go-gst v1.0.0/go.mod h1:sQMWMnR98s2B4w52e4IXyGvz75rXV8CZ1bejdPT3KIs= +github.com/go-gst/go-glib v1.1.0 h1:XTGhwk2BWYjW/UZ08y7ojf3iPPRiYtXL0W6vJkXNKFc= +github.com/go-gst/go-glib v1.1.0/go.mod h1:JybIYeoHNwCkHGaBf1fHNIaM4sQTrJPkPLsi7dmPNOU= +github.com/go-gst/go-gst v1.1.1-0.20240625092621-9195795a271e h1:H+ITwd21t1mhH1FWoQYJpcQ0N516fG/9s+XZISKpvdw= +github.com/go-gst/go-gst v1.1.1-0.20240625092621-9195795a271e/go.mod h1:izJ4GCBNWAv5W4mudSvvmDZhm98xvbCxH0GeK5A5VE8= github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= From f84e56e53e53916cf4c79b6250712f7b328e4236 Mon Sep 17 00:00:00 2001 From: David Colburn Date: Wed, 31 Jul 2024 14:43:16 -0400 Subject: [PATCH 2/2] update log function --- pkg/pipeline/watch.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/pipeline/watch.go b/pkg/pipeline/watch.go index 05234155..8b12c249 100644 --- a/pkg/pipeline/watch.go +++ b/pkg/pipeline/watch.go @@ -21,7 +21,6 @@ import ( "strings" "time" - "github.com/go-gst/go-glib/glib" "github.com/go-gst/go-gst/gst" "github.com/livekit/egress/pkg/errors" @@ -78,7 +77,14 @@ var ( } ) -func (c *Controller) gstLog(level gst.DebugLevel, file, function string, line int, _ *glib.Object, message string) { +func (c *Controller) gstLog( + _ *gst.DebugCategory, + level gst.DebugLevel, + file, function string, line int, + _ *gst.LoggedObject, + debugMsg *gst.DebugMessage, +) { + message := debugMsg.Get() lvl, ok := logLevels[level] if !ok || ignore[message] || ignore[function] { return