Fix query log

Author: bitbeans

SimpleDnsCrypt/ViewModels/AddressBlockLogViewModel.cs

@@ -83,7 +83,7 @@ public bool IsAddressBlockLogLogging
 			}
 		}
 
-		private async void AddressBlockLog(DnscryptProxyConfiguration dnscryptProxyConfiguration)
+		private void AddressBlockLog(DnscryptProxyConfiguration dnscryptProxyConfiguration)
 		{
 
 		}

SimpleDnsCrypt/ViewModels/MainViewModel.cs

@@ -110,8 +110,12 @@ public void Initialize()
 			{
 				_isDnsCryptAutomaticModeEnabled = false;
 			}
-		}
 
+			if (!string.IsNullOrEmpty(DnscryptProxyConfiguration?.query_log?.file))
+			{
+				QueryLogViewModel.IsQueryLogLogging = true;
+			}
+		}
 
 		public bool IsDnsCryptAutomaticModeEnabled
 		{

SimpleDnsCrypt/ViewModels/QueryLogViewModel.cs

@@ -14,17 +14,15 @@ namespace SimpleDnsCrypt.ViewModels
 	[Export(typeof(QueryLogViewModel))]
 	public class QueryLogViewModel : Screen
 	{
+		private static readonly ILog Log = LogManagerHelper.Factory();
 		private readonly IWindowManager _windowManager;
 		private readonly IEventAggregator _events;
 
-
 		private ObservableCollection<QueryLogLine> _queryLogLines;
 		private string _queryLogFile;
 		private bool _isQueryLogLogging;
 		private QueryLogLine _selectedQueryLogLine;
 
-	
-
 		[ImportingConstructor]
 		public QueryLogViewModel(IWindowManager windowManager, IEventAggregator events)
 		{
@@ -196,17 +194,27 @@ await Task.Run(() =>
 								}
 							}).ConfigureAwait(false);
 						else
-							IsQueryLogLogging = false;
+							_isQueryLogLogging = false;
 					else
-						IsQueryLogLogging = false;
+						_isQueryLogLogging = false;
 				}
 				else
 				{
+					//disable query log again
+					_isQueryLogLogging = false;
+					if (DnsCryptProxyManager.IsDnsCryptProxyRunning())
+					{
+						dnscryptProxyConfiguration.query_log.file = null;
+						DnsCryptProxyManager.Restart();
+						await Task.Delay(Global.ServiceRestartTime).ConfigureAwait(false);
+					}
 					Execute.OnUIThread(() => { QueryLogLines.Clear(); });
+					Execute.OnUIThread(() => { QueryLogFile = string.Empty; });
 				}
 			}
-			catch (Exception)
+			catch (Exception exception)
 			{
+				Log.Error(exception);
 			}
 		}
 	}

SimpleDnsCrypt/Views/MainView.xaml

@@ -136,10 +136,7 @@
                                                     <RowDefinition Height="Auto" />
                                                     <RowDefinition Height="*" />
                                                 </Grid.RowDefinitions>
-                                                <TextBlock Grid.Row="0" Foreground="DarkOrange" FontWeight="Bold"
-                                                           FontSize="18">
-                                                    Warning: Pre-Release! :)
-                                                </TextBlock>
+
                                                 <Button x:Name="SaveDnsCryptConfiguration" Grid.Row="1" Height="32"
                                                         Width="Auto"
                                                         VerticalAlignment="Bottom" HorizontalAlignment="Right"