From c5c2578d0f2477fbd62c7b7275bfec4f69a7ddcb Mon Sep 17 00:00:00 2001 From: Sergey Stepanov Date: Tue, 7 May 2024 23:05:03 +0300 Subject: [PATCH] Switch Trace to Debug in Libretro logging --- pkg/worker/caged/libretro/frontend.go | 7 +------ pkg/worker/caged/libretro/nanoarch/nanoarch.c | 1 + pkg/worker/caged/libretro/nanoarch/nanoarch.go | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/worker/caged/libretro/frontend.go b/pkg/worker/caged/libretro/frontend.go index 037af3b1..a88dca94 100644 --- a/pkg/worker/caged/libretro/frontend.go +++ b/pkg/worker/caged/libretro/frontend.go @@ -112,12 +112,7 @@ func NewFrontend(conf config.Emulator, log *logger.Logger) (*Frontend, error) { log = log.Extend(log.With().Str("m", "Libretro")) level := logger.Level(conf.Libretro.LogLevel) - if level == logger.DebugLevel { - level = logger.TraceLevel - nano.SetLogger(log.Extend(log.Level(level).With())) - } else { - nano.SetLogger(log) - } + nano.SetLogger(log.Extend(log.Level(level).With())) // Check if room is on local storage, if not, pull from GCS to local storage log.Info().Msgf("Local storage path: %v", conf.Storage) diff --git a/pkg/worker/caged/libretro/nanoarch/nanoarch.c b/pkg/worker/caged/libretro/nanoarch/nanoarch.c index 4edd73ff..b4e16b9b 100644 --- a/pkg/worker/caged/libretro/nanoarch/nanoarch.c +++ b/pkg/worker/caged/libretro/nanoarch/nanoarch.c @@ -231,6 +231,7 @@ void *run_loop(void *unused) { mutex_destroy(&done_mutex); pthread_detach(thread); core_log_cgo(RETRO_LOG_DEBUG, "UnLibCo run loop stop\n"); + pthread_exit(NULL); } void same_thread_stop() { diff --git a/pkg/worker/caged/libretro/nanoarch/nanoarch.go b/pkg/worker/caged/libretro/nanoarch/nanoarch.go index 30a4f529..3f297ba9 100644 --- a/pkg/worker/caged/libretro/nanoarch/nanoarch.go +++ b/pkg/worker/caged/libretro/nanoarch/nanoarch.go @@ -666,7 +666,7 @@ func coreLog(level C.enum_retro_log_level, msg *C.char) { switch level { // with debug level cores have too much logs case C.RETRO_LOG_DEBUG: - Nan0.log.Trace().MsgFunc(func() string { return m(msg) }) + Nan0.log.Debug().MsgFunc(func() string { return m(msg) }) case C.RETRO_LOG_INFO: Nan0.log.Info().MsgFunc(func() string { return m(msg) }) case C.RETRO_LOG_WARN: