CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added Write method to Logger

Browse source
This commit is contained in:
Jaex 2017-10-16 20:22:28 +03:00
parent d98060f18a
commit bbf00ed774
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ShareX.HelpersLib/Logger.cs
View file

@ -40,13 +40,13 @@ public class Logger
public string MessageFormat { get; set; } = "{0:yyyy-MM-dd HH:mm:ss.fff} - {1}";
public bool AsyncWrite { get; set; } = true;
public bool DebugWrite { get; set; } = true;
public bool StoreInMemory { get; set; } = true;
public bool StringWrite { get; set; } = true;
public bool FileWrite { get; set; } = false;
public string LogFilePath { get; private set; }
private readonly object loggerLock = new object();
private StringBuilder sbMessages = new StringBuilder();
private ConcurrentQueue<string> messageQueue = new ConcurrentQueue<string>();
private StringBuilder sbMessages = new StringBuilder();
public Logger()
{
@ -71,23 +71,23 @@ private void ProcessMessageQueue()
{
lock (loggerLock)
{
if (messageQueue.TryDequeue(out string message))
while (messageQueue.TryDequeue(out string message))
{
if (DebugWrite)
{
Debug.WriteLine(message);
Debug.Write(message);
}
if (StoreInMemory && sbMessages != null)
if (StringWrite && sbMessages != null)
{
sbMessages.AppendLine(message);
sbMessages.Append(message);
}
if (FileWrite && !string.IsNullOrEmpty(LogFilePath))
{
try
{
File.AppendAllText(LogFilePath, message + Environment.NewLine, Encoding.UTF8);
File.AppendAllText(LogFilePath, message, Encoding.UTF8);
}
catch (Exception e)
{
@ -100,12 +100,11 @@ private void ProcessMessageQueue()
}
}
public void WriteLine(string message)
public void Write(string message)
{
if (message != null)
{
message = string.Format(MessageFormat, DateTime.Now, message);
messageQueue.Enqueue(message);
if (AsyncWrite)
@ -119,6 +118,16 @@ public void WriteLine(string message)
}
}
public void Write(string format, params object[] args)
{
Write(string.Format(format, args));
}
public void WriteLine(string message)
{
Write(message + Environment.NewLine);
}
public void WriteLine(string format, params object[] args)
{
WriteLine(string.Format(format, args));
@ -126,7 +135,7 @@ public void WriteLine(string format, params object[] args)
public void WriteException(string exception, string message = "Exception")
{
WriteLine("{0}:{1}{2}", message, Environment.NewLine, exception);
WriteLine($"{message}:{Environment.NewLine}{exception}");
}
public void WriteException(Exception exception, string message = "Exception")

10
ShareX.UploadersLib/BaseUploaders/Uploader.cs
View file

@ -599,7 +599,7 @@ private void WriteVerboseLog(string url, Dictionary<string, string> args, NameVa
verboseLogger = new Logger(VerboseLogsPath)
{
MessageFormat = "Date: {0:yyyy-MM-dd HH:mm:ss.fff}\r\n{1}",
StoreInMemory = false
StringWrite = false
};
}
@ -628,7 +628,13 @@ private void WriteVerboseLog(string url, Dictionary<string, string> args, NameVa
}
}
sb.AppendLine("Response:\r\n" + (response ?? ""));
sb.AppendLine("Response:");
if (!string.IsNullOrEmpty(response))
{
sb.AppendLine(response);
}
sb.Append(new string('-', 30));
verboseLogger.WriteLine(sb.ToString());