Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(plugin)!: Logger.minLogLevel -> Logger.MinLogLevel #580

Merged
merged 1 commit into from
May 19, 2022
Merged

refactor(plugin)!: Logger.minLogLevel -> Logger.MinLogLevel #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/MediaPipeUnity/Samples/Common/Scripts/Bootstrap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions Assets/MediaPipeUnity/Samples/UI/Scripts/GUIConsole.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
62 changes: 31 additions & 31 deletions Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/Logger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface IExtendedLogger : ILogger

public static class Logger
{
public enum LogLevel
public enum LogLevel : int
{
Fatal,
Error,
Expand All @@ -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);
}
}

Expand All @@ -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);
}
}

Expand All @@ -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);
}
}

Expand Down Expand Up @@ -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); }
Expand Down