diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-08-04 14:18:28 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-08-04 14:18:28 +0300 |
| commit | 91d5be468e28266a4ae18ee3845f0cb3433dd898 (patch) | |
| tree | 267173e3d906a2168ac72692b8d4ec523f59d30f /Software/Visual_Studio/Tango.Logging | |
| parent | a5c6a3baaf597ef58369192716ffe02d3af87ac2 (diff) | |
| download | Tango-91d5be468e28266a4ae18ee3845f0cb3433dd898.tar.gz Tango-91d5be468e28266a4ae18ee3845f0cb3433dd898.zip | |
Reset Application & Firmware "Logs" tab even when machine connection is the same.
Fixed issue on FileSystem download.
Ignored issue with procedure error highlighting caused application error.
Fixed issue when logout/login with different environment did not refreshed the list of available machines for connection.
Diffstat (limited to 'Software/Visual_Studio/Tango.Logging')
4 files changed, 26 insertions, 27 deletions
diff --git a/Software/Visual_Studio/Tango.Logging/FileLogger.cs b/Software/Visual_Studio/Tango.Logging/FileLogger.cs index 0839a5ee7..041b56be4 100644 --- a/Software/Visual_Studio/Tango.Logging/FileLogger.cs +++ b/Software/Visual_Studio/Tango.Logging/FileLogger.cs @@ -138,6 +138,8 @@ namespace Tango.Logging /// <param name="output">The output.</param> public void OnLog(LogItemBase output) { + if (output.SkipFileLogging) return; + try { if (DateTime.Now.Date > _logFileTimeDate.Date) diff --git a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs index 01d520f6a..944f61130 100644 --- a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs +++ b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs @@ -24,10 +24,22 @@ namespace Tango.Logging /// </summary> public Object LogObject { + get { return _logObject; } set { _logObject = value; } } + [NonSerialized] + private bool _skipFileLogging; + /// <summary> + /// Gets or sets a value indicating whether this log should not be written to a file. + /// </summary> + public bool SkipFileLogging + { + get { return _skipFileLogging; } + set { _skipFileLogging = value; } + } + /// <summary> /// Gets or sets the caller method adding the exception. /// </summary> diff --git a/Software/Visual_Studio/Tango.Logging/LogManager.cs b/Software/Visual_Studio/Tango.Logging/LogManager.cs index bbc6baf57..55264164a 100644 --- a/Software/Visual_Studio/Tango.Logging/LogManager.cs +++ b/Software/Visual_Studio/Tango.Logging/LogManager.cs @@ -102,9 +102,9 @@ namespace Tango.Logging /// </summary> /// <param name="e">Exception.</param> /// <param name="description">Error description.</param> - public Exception Log(Exception e, String description = null, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) + public Exception Log(Exception e, String description = null, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) { - return Log(e, LogCategory.Error, description, caller, file, lineNumber); + return Log(e, LogCategory.Error, description, skipFileLogging, caller, file, lineNumber); } /// <summary> @@ -112,7 +112,7 @@ namespace Tango.Logging /// </summary> /// <param name="e">Exception.</param> /// <param name="description">Error description.</param> - public Exception Log(Exception e, LogCategory category, String description = null, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) + public Exception Log(Exception e, LogCategory category, String description = null, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) { if (!Categories.Contains(category)) return e; @@ -125,6 +125,7 @@ namespace Tango.Logging log.Category = category; log.Description = description; log.Message = log.Description + Environment.NewLine + log.Exception.FlattenException(); + log.SkipFileLogging = skipFileLogging; AppendLog(log); @@ -132,47 +133,28 @@ namespace Tango.Logging } /// <summary> - /// Add new exception log item. - /// </summary> - /// <param name="e">Exception.</param> - /// <param name="description">Error description.</param> - public Exception LogFormat(Exception e, String description, object argument, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) - { - return Log(e, LogCategory.Error, String.Format(description, argument), caller, file, lineNumber); - } - - /// <summary> - /// Add new message log item. - /// </summary> - /// <param name="message">Message.</param> - public String LogFormat(String message, object argument, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) - { - return Log(String.Format(message, argument), LogCategory.Info, null, caller, file, lineNumber); - } - - /// <summary> /// Add new message log item. /// </summary> /// <param name="message">Message.</param> - public String Log(String message, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) + public String Log(String message, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) { - return Log(message, LogCategory.Info, null, caller, file, lineNumber); + return Log(message, LogCategory.Info, null, skipFileLogging, caller, file, lineNumber); } /// <summary> /// Add new message log item. /// </summary> /// <param name="message">Message.</param> - public String Log(String message, LogCategory category, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) + public String Log(String message, LogCategory category, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) { - return Log(message, category, null, caller, file, lineNumber); + return Log(message, category, null, skipFileLogging, caller, file, lineNumber); } /// <summary> /// Add new message log item. /// </summary> /// <param name="message">Message.</param> - public String Log(String message, LogCategory category, Object logObject, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) + public String Log(String message, LogCategory category, Object logObject, bool skipFileLogging = false, [CallerMemberName] string caller = null, [CallerFilePath] string file = null, [CallerLineNumber] int lineNumber = 0) { if (!Categories.Contains(category)) return message; @@ -184,6 +166,7 @@ namespace Tango.Logging log.Category = category; log.Message = message; log.LogObject = logObject; + log.SkipFileLogging = skipFileLogging; AppendLog(log); diff --git a/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs b/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs index 4e378bfbf..efe74c899 100644 --- a/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs +++ b/Software/Visual_Studio/Tango.Logging/SessionFileLogger.cs @@ -102,6 +102,8 @@ namespace Tango.Logging /// <param name="output">The output.</param> public void OnLog(LogItemBase output) { + if (output.SkipFileLogging) return; + if (_inInSession) { try |
