From a820393b2aae329ef2033372a98125c230e3865b Mon Sep 17 00:00:00 2001 From: David Colburn Date: Tue, 9 Jul 2024 14:52:20 -0700 Subject: [PATCH] try 1.24.4 --- build/egress/Dockerfile | 4 ++-- build/test/Dockerfile | 4 ++-- magefile.go | 2 +- pkg/config/base.go | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/egress/Dockerfile b/build/egress/Dockerfile index 539cf42d..ecd454ed 100644 --- a/build/egress/Dockerfile +++ b/build/egress/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM livekit/gstreamer:1.24.0-dev +FROM livekit/gstreamer:1.24.4-dev ARG TARGETPLATFORM ARG TARGETARCH @@ -51,7 +51,7 @@ ENV TINI_VERSION v0.19.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini RUN chmod +x /tini -FROM livekit/gstreamer:1.24.0-prod +FROM livekit/gstreamer:1.24.4-prod ARG TARGETPLATFORM diff --git a/build/test/Dockerfile b/build/test/Dockerfile index 7cab211e..cb720f29 100644 --- a/build/test/Dockerfile +++ b/build/test/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM livekit/gstreamer:1.24.0-dev +FROM livekit/gstreamer:1.24.4-dev WORKDIR /workspace @@ -48,7 +48,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd CGO_ENABLED=1 GOOS=linux GOARCH=${GOARCH} GO111MODULE=on go test -c -v -race --tags=integration ./test -FROM livekit/gstreamer:1.24.0-prod +FROM livekit/gstreamer:1.24.4-prod ARG TARGETPLATFORM diff --git a/magefile.go b/magefile.go index c38828fd..42ec89a1 100644 --- a/magefile.go +++ b/magefile.go @@ -29,7 +29,7 @@ import ( ) const ( - gstVersion = "1.24.0" + gstVersion = "1.24.4" libniceVersion = "0.1.21" chromiumVersion = "125.0.6422.141" dockerBuild = "docker build" diff --git a/pkg/config/base.go b/pkg/config/base.go index d7f9596c..4138f1ed 100644 --- a/pkg/config/base.go +++ b/pkg/config/base.go @@ -111,16 +111,16 @@ func (c *BaseConfig) initLogger(values ...interface{}) error { c.Logging.Level = c.LogLevel } - // var gstDebug string - // switch c.Logging.Level { - // case "debug": - // gstDebug = "3" - // case "info", "warn": - // gstDebug = "2" - // case "error": - // gstDebug = "1" - // } - if err := os.Setenv("GST_DEBUG", "GST_CAPS:4"); err != nil { + var gstDebug string + switch c.Logging.Level { + case "debug": + gstDebug = "3" + case "info", "warn": + gstDebug = "2" + case "error": + gstDebug = "1" + } + if err := os.Setenv("GST_DEBUG", gstDebug); err != nil { return err }