diff --git a/mRemoteNGTests/Messages/MessagePrinters/TextLogMessagePrinterTests.cs b/mRemoteNGTests/Messages/MessagePrinters/TextLogMessagePrinterTests.cs index c0df887be..d328afb66 100644 --- a/mRemoteNGTests/Messages/MessagePrinters/TextLogMessagePrinterTests.cs +++ b/mRemoteNGTests/Messages/MessagePrinters/TextLogMessagePrinterTests.cs @@ -39,12 +39,12 @@ namespace mRemoteNGTests.Messages.MessagePrinters } [Test] - public void ReportMessagesPassedToLog4Net() + public void DebugMessagesPassedToLog4Net() { var message = Substitute.For(); - message.Class.Returns(MessageClass.ReportMsg); + message.Class.Returns(MessageClass.DebugMsg); _messagePrinter.Print(message); - _log4NetLogger.ReceivedWithAnyArgs(1).Info(""); + _log4NetLogger.ReceivedWithAnyArgs(1).Debug(""); } [Test] @@ -76,13 +76,13 @@ namespace mRemoteNGTests.Messages.MessagePrinters } [Test] - public void ReportMessagesNotPassedToLog4NetIfTurnedOff() + public void DebugMessagesNotPassedToLog4NetIfTurnedOff() { var message = Substitute.For(); - message.Class.Returns(MessageClass.ReportMsg); - _messagePrinter.PrintReportMessages = false; + message.Class.Returns(MessageClass.DebugMsg); + _messagePrinter.PrintDebugMessages = false; _messagePrinter.Print(message); - _log4NetLogger.DidNotReceiveWithAnyArgs().Info(""); + _log4NetLogger.DidNotReceiveWithAnyArgs().Debug(""); } [Test] diff --git a/mRemoteV1/Connection/ConnectionInitiator.cs b/mRemoteV1/Connection/ConnectionInitiator.cs index 68729e225..9ae66f195 100644 --- a/mRemoteV1/Connection/ConnectionInitiator.cs +++ b/mRemoteV1/Connection/ConnectionInitiator.cs @@ -252,7 +252,7 @@ namespace mRemoteNG.Connection else connDetail = "UNKNOWN"; - Runtime.MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(Language.strConnenctionClosedByUser, connDetail, Prot.InterfaceControl.Info.Protocol, Environment.UserName)); + Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnenctionClosedByUser, connDetail, Prot.InterfaceControl.Info.Protocol, Environment.UserName)); Prot.InterfaceControl.Info.OpenConnections.Remove(Prot); if (Prot.InterfaceControl.Info.PostExtApp == "") return; @@ -269,7 +269,7 @@ namespace mRemoteNG.Connection { var prot = (ProtocolBase)sender; Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventConnected, true); - Runtime.MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol, Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField)); + Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol, Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField)); } private static void Prot_Event_ErrorOccured(object sender, string errorMessage) diff --git a/mRemoteV1/Messages/MessageClassEnum.cs b/mRemoteV1/Messages/MessageClassEnum.cs index 53a495316..2edb22ab0 100644 --- a/mRemoteV1/Messages/MessageClassEnum.cs +++ b/mRemoteV1/Messages/MessageClassEnum.cs @@ -5,6 +5,6 @@ InformationMsg = 0, WarningMsg = 1, ErrorMsg = 2, - ReportMsg = 3 + DebugMsg = 3 } } \ No newline at end of file diff --git a/mRemoteV1/Messages/MessageCollector.cs b/mRemoteV1/Messages/MessageCollector.cs index 4488a62ba..3a413c8f7 100644 --- a/mRemoteV1/Messages/MessageCollector.cs +++ b/mRemoteV1/Messages/MessageCollector.cs @@ -26,9 +26,9 @@ namespace mRemoteNG.Messages { var nMsg = new Message(msgClass, msgText, DateTime.Now); - if (nMsg.Class == MessageClass.ReportMsg) + if (nMsg.Class == MessageClass.DebugMsg) { - AddReportMessage(nMsg); + AddDebugMessage(nMsg); return; } @@ -98,11 +98,11 @@ namespace mRemoteNG.Messages Logger.Instance.Error(nMsg.Text); } - private static void AddReportMessage(IMessage nMsg) + private static void AddDebugMessage(IMessage nMsg) { - Debug.Print("Report: " + nMsg.Text); + Debug.Print("Debug: " + nMsg.Text); if (Settings.Default.WriteLogFile) - Logger.Instance.Info(nMsg.Text); + Logger.Instance.Debug(nMsg.Text); } private static ListViewItem BuildListViewItem(IMessage nMsg) diff --git a/mRemoteV1/Messages/MessagePrinters/PopupMessagePrinter.cs b/mRemoteV1/Messages/MessagePrinters/PopupMessagePrinter.cs index 41825ccfa..a842ec7f8 100644 --- a/mRemoteV1/Messages/MessagePrinters/PopupMessagePrinter.cs +++ b/mRemoteV1/Messages/MessagePrinters/PopupMessagePrinter.cs @@ -10,7 +10,7 @@ namespace mRemoteNG.Messages.MessagePrinters { switch (message.Class) { - case MessageClass.ReportMsg: + case MessageClass.DebugMsg: MessageBox.Show(message.Text, string.Format(Language.strTitleInformation, message.Date), MessageBoxButtons.OK, MessageBoxIcon.Information); break; case MessageClass.InformationMsg: diff --git a/mRemoteV1/Messages/MessagePrinters/TextLogMessagePrinter.cs b/mRemoteV1/Messages/MessagePrinters/TextLogMessagePrinter.cs index eaf29d33e..5cd9771fd 100644 --- a/mRemoteV1/Messages/MessagePrinters/TextLogMessagePrinter.cs +++ b/mRemoteV1/Messages/MessagePrinters/TextLogMessagePrinter.cs @@ -8,7 +8,7 @@ namespace mRemoteNG.Messages.MessagePrinters { private readonly ILog _logger; - public bool PrintReportMessages { get; set; } = true; + public bool PrintDebugMessages { get; set; } = true; public bool PrintInfoMessages { get; set; } = true; public bool PrintWarningMessages { get; set; } = true; public bool PrintErrorMessages { get; set; } = true; @@ -29,9 +29,9 @@ namespace mRemoteNG.Messages.MessagePrinters if (PrintInfoMessages) _logger.Info(message.Text); break; - case MessageClass.ReportMsg: - if (PrintReportMessages) - _logger.Info(message.Text); + case MessageClass.DebugMsg: + if (PrintDebugMessages) + _logger.Debug(message.Text); break; case MessageClass.WarningMsg: if (PrintWarningMessages)