diff --git a/OpenBullet/Pages/Main/Stacker.xaml.cs b/OpenBullet/Pages/Main/Stacker.xaml.cs index 30a2a52..722d395 100644 --- a/OpenBullet/Pages/Main/Stacker.xaml.cs +++ b/OpenBullet/Pages/Main/Stacker.xaml.cs @@ -355,7 +355,8 @@ namespace OpenBullet Globals.LogInfo(Components.Stacker, "Setting the first block as the current block"); // Print start line - vm.BotData.LogBuffer.Add(new LogEntry(string.Format("===== DEBUGGER STARTED FOR CONFIG {0} WITH DATA {1} AND PROXY {2} ({3}) ====="+Environment.NewLine, vm.Config.Name, vm.TestData, vm.TestProxy, vm.UseProxy ? "ENABLED" : "DISABLED"), Colors.White)); + var proxyEnabledText = vm.UseProxy ? "ENABLED" : "DISABLED"; + vm.BotData.LogBuffer.Add(new LogEntry($"===== DEBUGGER STARTED FOR CONFIG {vm.Config.Name} WITH DATA {vm.TestData} AND PROXY {vm.TestProxy} ({vm.ProxyType}) {proxyEnabledText} ====={Environment.NewLine}", Colors.White)); startTime = DateTime.Now; // Open browser if Always Open diff --git a/RuriLib/Runner/RunnerViewModel.cs b/RuriLib/Runner/RunnerViewModel.cs index c292a7a..3bf65d6 100644 --- a/RuriLib/Runner/RunnerViewModel.cs +++ b/RuriLib/Runner/RunnerViewModel.cs @@ -659,7 +659,8 @@ namespace RuriLib.Runner ================= */ // Print the start message - BotLog.Add(new LogEntry(string.Format("===== LOG FOR BOT #{0} WITH DATA {1} AND PROXY {2} =====" + Environment.NewLine, bot.Id, botData.Data.Data, botData.Proxy == null ? "NONE" : botData.Proxy.Proxy), Colors.White)); + var proxyUsedText = botData.Proxy == null ? "NONE" : $"{botData.Proxy.Proxy} ({botData.Proxy.Type})"; + BotLog.Add(new LogEntry($"===== LOG FOR BOT #{bot.Id} WITH DATA {botData.Data.Data} AND PROXY {proxyUsedText} ====={Environment.NewLine}", Colors.White)); if (!Settings.General.EnableBotLog) BotLog.Add(new LogEntry("The Bot Logging is disabled in General Settings", Colors.Tomato)); // Open browser if Always Open @@ -688,14 +689,14 @@ namespace RuriLib.Runner { if (Settings.General.BotsDisplayMode == BotsDisplayMode.Everything) bot.Status = $"<<< ERROR IN BLOCK: {loli.CurrentBlock} >>>"; - RaiseMessageArrived(LogLevel.Error, $"[{bot.Id}][{bot.Data}][{bot.Proxy}] ERROR in block {loli.CurrentBlock} | Exception: {ex.Message}", false); + RaiseMessageArrived(LogLevel.Error, $"[{bot.Id}][{bot.Data}][{proxyUsedText}] ERROR in block {loli.CurrentBlock} | Exception: {ex.Message}", false); Thread.Sleep(1000); } catch (Exception ex) { if (Settings.General.BotsDisplayMode == BotsDisplayMode.Everything) bot.Status = "<<< SCRIPT ERROR >>>"; - RaiseMessageArrived(LogLevel.Error, $"[{bot.Id}][{bot.Data}][{bot.Proxy}] ERROR in the script | Exception: {ex.Message}", false); + RaiseMessageArrived(LogLevel.Error, $"[{bot.Id}][{bot.Data}][{proxyUsedText}] ERROR in the script | Exception: {ex.Message}", false); Thread.Sleep(1000); } @@ -713,7 +714,7 @@ namespace RuriLib.Runner if (Settings.General.BotsDisplayMode != BotsDisplayMode.None) bot.Status = $"<<< FINISHED WITH RESULT: {botData.StatusString} >>>"; - RaiseMessageArrived(LogLevel.Info, $"[{bot.Id}][{bot.Data}][{bot.Proxy}] Ended with result {botData.StatusString}", false); + RaiseMessageArrived(LogLevel.Info, $"[{bot.Id}][{bot.Data}][{proxyUsedText}] Ended with result {botData.StatusString}", false); // Quit Browser if Always Quit if (Config.Settings.AlwaysQuit)