diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs index 555a2fcf6..9fa7084aa 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs @@ -39,7 +39,7 @@ private void OnEnable() private IEnumerator Init() { Logger.SetLogger(new MemoizedLogger(100)); - Logger.minLogLevel = Logger.LogLevel.Debug; + Logger.MinLogLevel = Logger.LogLevel.Debug; Protobuf.SetLogHandler(Protobuf.DefaultLogHandler); diff --git a/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs b/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs index c8eb96d85..2d0f0e54d 100644 --- a/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs +++ b/Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs @@ -45,12 +45,12 @@ private void InitializeView() { _contentRoot = gameObject.transform.Find(_ContentPath).gameObject.transform; - if (!(Logger.logger is MemoizedLogger)) + if (!(Logger.InternalLogger is MemoizedLogger)) { return; } - _logger = (MemoizedLogger)Logger.logger; + _logger = (MemoizedLogger)Logger.InternalLogger; lock (((ICollection)_logger.histories).SyncRoot) { foreach (var log in _logger.histories) diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Logger.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Logger.cs index 0c80c802c..269af9be1 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Logger.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Logger.cs @@ -21,7 +21,7 @@ public interface IExtendedLogger : ILogger public static class Logger { - public enum LogLevel + public enum LogLevel : int { Fatal, Error, @@ -31,63 +31,63 @@ public enum LogLevel Debug, } - public static LogLevel minLogLevel { get; set; } = LogLevel.Info; - private static IExtendedLogger _Logger; - public static IExtendedLogger logger + public static LogLevel MinLogLevel { get; set; } = LogLevel.Info; + private static IExtendedLogger _InternalLogger; + public static IExtendedLogger InternalLogger { get { - if (_Logger == null) + if (_InternalLogger == null) { - _Logger = new LoggerWrapper(Debug.unityLogger); + _InternalLogger = new LoggerWrapper(Debug.unityLogger); } - return _Logger; + return _InternalLogger; } } public static void SetLogger(IExtendedLogger newLogger) { - _Logger = newLogger; + _InternalLogger = newLogger; } public static void SetLogger(ILogger newLogger) { - _Logger = new LoggerWrapper(newLogger); + _InternalLogger = new LoggerWrapper(newLogger); } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void LogException(Exception exception, UnityEngine.Object context) { - if (minLogLevel >= LogLevel.Error) + if (MinLogLevel >= LogLevel.Error) { - logger.LogException(exception, context); + InternalLogger.LogException(exception, context); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void LogException(Exception exception) { - if (minLogLevel >= LogLevel.Error) + if (MinLogLevel >= LogLevel.Error) { - logger.LogException(exception); + InternalLogger.LogException(exception); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void LogError(string tag, object message, UnityEngine.Object context) { - if (minLogLevel >= LogLevel.Error) + if (MinLogLevel >= LogLevel.Error) { - logger.LogError(tag, message, context); + InternalLogger.LogError(tag, message, context); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void LogError(string tag, object message) { - if (minLogLevel >= LogLevel.Error) + if (MinLogLevel >= LogLevel.Error) { - logger.LogError(tag, message); + InternalLogger.LogError(tag, message); } } @@ -100,18 +100,18 @@ public static void LogError(object message) [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void LogWarning(string tag, object message, UnityEngine.Object context) { - if (minLogLevel >= LogLevel.Info) + if (MinLogLevel >= LogLevel.Info) { - logger.LogWarning(tag, message, context); + InternalLogger.LogWarning(tag, message, context); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void LogWarning(string tag, object message) { - if (minLogLevel >= LogLevel.Info) + if (MinLogLevel >= LogLevel.Info) { - logger.LogWarning(tag, message); + InternalLogger.LogWarning(tag, message); } } @@ -124,36 +124,36 @@ public static void LogWarning(object message) [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void Log(LogLevel logLevel, string tag, object message, UnityEngine.Object context) { - if (minLogLevel >= logLevel) + if (MinLogLevel >= logLevel) { - logger.Log(logLevel, tag, message, context); + InternalLogger.Log(logLevel, tag, message, context); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void Log(LogLevel logLevel, string tag, object message) { - if (minLogLevel >= logLevel) + if (MinLogLevel >= logLevel) { - logger.Log(logLevel, tag, message); + InternalLogger.Log(logLevel, tag, message); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void Log(LogLevel logLevel, object message, UnityEngine.Object context) { - if (minLogLevel >= logLevel) + if (MinLogLevel >= logLevel) { - logger.Log(logLevel, message, context); + InternalLogger.Log(logLevel, message, context); } } [Conditional("DEBUG"), Conditional("DEVELOPMENT_BUILD")] public static void Log(LogLevel logLevel, object message) { - if (minLogLevel >= logLevel) + if (MinLogLevel >= logLevel) { - logger.Log(logLevel, message); + InternalLogger.Log(logLevel, message); } } @@ -241,13 +241,13 @@ public LogType filterLogType public bool logEnabled { get => _logger.logEnabled; - set => logger.logEnabled = value; + set => _logger.logEnabled = value; } public ILogHandler logHandler { get => _logger.logHandler; - set => logger.logHandler = value; + set => _logger.logHandler = value; } public bool IsLogTypeAllowed(LogType logType) { return _logger.IsLogTypeAllowed(logType); }