Skip to content

Commit 8fe285b

Browse files
committed
Use Nlog Debug Target instead of direct print
1 parent a75a5c4 commit 8fe285b

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

Flow.Launcher.Infrastructure/Logger/Log.cs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,30 @@ static Log()
3232
};
3333

3434
var fileTargetASyncWrapper = new AsyncTargetWrapper(fileTarget);
35+
36+
var debugTarget = new DebuggerTarget
37+
{
38+
Layout = "${level:uppercase=true}|${message}"
39+
};
40+
3541
configuration.AddTarget("file", fileTargetASyncWrapper);
42+
configuration.AddTarget("console", debugTarget);
3643
#if DEBUG
37-
var rule = new LoggingRule("*", LogLevel.Debug, fileTargetASyncWrapper);
44+
var fileRule = new LoggingRule("*", LogLevel.Debug, fileTargetASyncWrapper);
45+
var debugRule = new LoggingRule("*", LogLevel.Debug, debugTarget);
3846
#else
3947
var rule = new LoggingRule("*", LogLevel.Info, fileTargetASyncWrapper);
48+
var debugRule = new LoggingRule("*", LogLevel.Info, consoleTarget);
4049
#endif
41-
configuration.LoggingRules.Add(rule);
50+
configuration.LoggingRules.Add(fileRule);
51+
configuration.LoggingRules.Add(debugRule);
4252
LogManager.Configuration = configuration;
4353
}
4454

4555
private static void LogFaultyFormat(string message)
4656
{
4757
var logger = LogManager.GetLogger("FaultyLogger");
4858
message = $"Wrong logger message format <{message}>";
49-
System.Diagnostics.Debug.WriteLine($"FATAL|{message}");
5059
logger.Fatal(message);
5160
}
5261

@@ -57,9 +66,9 @@ private static bool FormatValid(string message)
5766
return valid;
5867
}
5968

60-
69+
6170
public static void Exception(string className, string message, System.Exception exception, [CallerMemberName] string methodName = "")
62-
{
71+
{
6372
exception = exception.Demystify();
6473
#if DEBUG
6574
ExceptionDispatchInfo.Capture(exception).Throw();
@@ -96,7 +105,6 @@ private static void ExceptionInternal(string classAndMethod, string message, Sys
96105
{
97106
var logger = LogManager.GetLogger(classAndMethod);
98107

99-
System.Diagnostics.Debug.WriteLine($"ERROR|{message}");
100108

101109
logger.Error("-------------------------- Begin exception --------------------------");
102110
logger.Error(message);
@@ -123,8 +131,6 @@ private static void LogInternal(string message, LogLevel level)
123131
var prefix = parts[1];
124132
var unprefixed = parts[2];
125133
var logger = LogManager.GetLogger(prefix);
126-
127-
System.Diagnostics.Debug.WriteLine($"{level.Name}|{message}");
128134
logger.Log(level, unprefixed);
129135
}
130136
else
@@ -134,6 +140,7 @@ private static void LogInternal(string message, LogLevel level)
134140
}
135141

136142
/// <param name="message">example: "|prefix|unprefixed" </param>
143+
/// <param name="e">Exception</param>
137144
[MethodImpl(MethodImplOptions.Synchronized)]
138145
public static void Exception(string message, System.Exception e)
139146
{
@@ -172,7 +179,6 @@ private static void LogInternal(LogLevel level, string className, string message
172179

173180
var logger = LogManager.GetLogger(classNameWithMethod);
174181

175-
System.Diagnostics.Debug.WriteLine($"{level.Name}|{message}");
176182
logger.Log(level, message);
177183
}
178184

Plugins/Flow.Launcher.Plugin.Program/Logger/ProgramLogger.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ static ProgramLogger()
4848
internal static void LogException(string classname, string callingMethodName, string loadingProgramPath,
4949
string interpretationMessage, Exception e)
5050
{
51-
Debug.WriteLine($"ERROR{classname}|{callingMethodName}|{loadingProgramPath}|{interpretationMessage}");
52-
5351
var logger = LogManager.GetLogger("");
5452

5553
var innerExceptionNumber = 1;

0 commit comments

Comments
 (0)