remove some logging

j2ghz · Aug 16, 2018 · fa90ece · fa90ece
1 parent 6df1cf4
commit fa90ece
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/src/ModSink.Common/Client/ClientService.cs b/src/ModSink.Common/Client/ClientService.cs
@@ -47,15 +47,9 @@ public ClientService(IDownloader downloader, IFormatter serializationFormatter,
                 .DisposeWith(disposable)
                 .Connect()
                 .LeftJoin(filesAvailable.Connect(), f => f,
-                    (required, available) =>
-                    {
-                        LogTo.Verbose(
-                            available.HasValue ? "File {signature} is available" : "File {signature} is not available",
-                            required);
-                        return !available.HasValue
-                            ? Optional<FileSignature>.Create(required)
-                            : Optional<FileSignature>.None;
-                    })
+                    (required, available) => !available.HasValue
+                        ? Optional<FileSignature>.Create(required)
+                        : Optional<FileSignature>.None)
                 .Filter(opt => opt.HasValue)
                 .Transform(opt => opt.Value)
                 .InnerJoin(OnlineFiles.Connect(), of => of.FileSignature,

diff --git a/src/ModSink.Common/Client/FileAccessService.cs b/src/ModSink.Common/Client/FileAccessService.cs
@@ -23,7 +23,7 @@ public FileAccessService(DirectoryInfo localDir)
         IEnumerable<FileSignature> IFileAccessService.FilesAvailable()
         {
             foreach (var fileInfo in localDir.EnumerateFiles()
-                //.Where(f => f.Name.EndsWith(".tmp"))
+                .Where(f => f.Name.EndsWith(".tmp"))
             )
                 fileInfo.Delete();
 
@@ -57,13 +57,16 @@ public void TemporaryFinished(FileSignature fileSignature)
             var final = GetFileInfo(fileSignature, false);
             LogTo.Verbose("Renaming file {src} to {dst}", temp, final);
 
-            Policy
-                .Handle<IOException>()
-                .WaitAndRetry(5, i => Math.Pow(2, i).Seconds(),
-                    (exception, duration) => LogTo.Warning(exception,
-                        "Moving file from {src} to {dst} has failed after {duration}", temp.FullName, final.FullName,
-                        duration))
-                .Execute(() => temp.MoveTo(final.FullName));
+            //Policy
+            //    .Handle<IOException>()
+            //    .WaitAndRetry(5, i => Math.Pow(2, i).Seconds(),
+            //        (exception, duration) => LogTo.Warning(exception,
+            //            "Moving file from {src} to {dst} has failed after {duration}", temp.FullName, final.FullName,
+            //            duration))
+            //    .Execute(() =>
+            //    {
+                    temp.MoveTo(final.FullName);
+                //});
         }
 
         private FileInfo GetFileInfo(FileSignature fileSignature, bool temporary)

diff --git a/src/ModSink.Common/Client/QueuedDownload.cs b/src/ModSink.Common/Client/QueuedDownload.cs
@@ -15,7 +15,6 @@ public QueuedDownload(FileSignature fileSignature, Uri source)
         {
             FileSignature = fileSignature;
             Source = source;
-            LogTo.Verbose("Created QueuedDownload for {signature}", fileSignature);
         }
     }
 }
diff --git a/src/ModSink.WPF/App.xaml.cs b/src/ModSink.WPF/App.xaml.cs
@@ -96,6 +96,7 @@ private void SetupLogging()
                 .Enrich.WithThreadId()
                 .MinimumLevel.Verbose()
                 .CreateLogger();
+
             Log.Information("Log initialized");
             if (!Debugger.IsAttached)
             {
@@ -126,7 +127,10 @@ private void SetupLogging()
             Countly.UserDetails.Username = Environment.UserName;
             Countly.UserDetails.Organization = Environment.MachineName;
             Countly.StartSession("https://countly.j2ghz.com", "54c6bf3a77021fadb7bd5b2a66490b465d4382ac", FullVersion);
-            DispatcherMonitor.Start();
+            if (!Debugger.IsAttached)
+            {
+                DispatcherMonitor.Start();
+            }
         }
     }
 }
diff --git a/src/ModSink.WPF/ModSink.WPF.csproj b/src/ModSink.WPF/ModSink.WPF.csproj
@@ -12,6 +12,9 @@
     <ApplicationIcon>modsink_x3S_icon.ico</ApplicationIcon>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
     <!-- App.xaml -->

diff --git a/src/ModSink.WPF/ViewModel/DownloadViewModel.cs b/src/ModSink.WPF/ViewModel/DownloadViewModel.cs
@@ -71,8 +71,6 @@ public void Dispose()
 
         private ObservableAsPropertyHelper<T> LogErrorsAndDispose<T>(ObservableAsPropertyHelper<T> oaph)
         {
-            oaph.ThrownExceptions.Subscribe(e =>
-                LogTo.Error(e, "[{download}] failed", Name));
             oaph.DisposeWith(disposable);
             return oaph;
         }