Changeset 1777 for branches/eraser6/CodeReview/Eraser.DefaultPlugins/FileSystems/Windows.cs

Timestamp:

2/9/2010 7:23:22 AM (3 years ago)

Author:

lowjoel

Message:

Redesigned the Logger paradigm -- instead of a dealing with a logger object to do any form of logging, we have a static Logger class which code can log to, and define log targets to receive those logs. Also included is a LogSession? class which sets the log target for the current thread or for a few threads. Addresses #320: Logging improvements

File:

• branches/eraser6/CodeReview/Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (8 diffs)

branches/eraser6/CodeReview/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -155 +155 @@
 
         public override void EraseClusterTips(VolumeInfo info, ErasureMethod method,
-            Logger log, ClusterTipsSearchProgress searchCallback,
-            ClusterTipsEraseProgress eraseCallback)
+            ClusterTipsSearchProgress searchCallback, ClusterTipsEraseProgress eraseCallback)
         {
             //List all the files which can be erased.
@@ -163 +162 @@
                 throw new InvalidOperationException(S._("Could not erase cluster tips in {0} " +
                     "as the volume is not mounted.", info.VolumeId));
-            ListFiles(new DirectoryInfo(info.MountPoints[0]), files, log, searchCallback);
+            ListFiles(new DirectoryInfo(info.MountPoints[0]), files, searchCallback);
 
             //For every file, erase the cluster tips.
@@ -180 +179 @@
                 catch (UnauthorizedAccessException)
                 {
-                    log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have its " +
-                        "cluster tips erased because you do not have the required permissions to " +
-                        "erase the file cluster tips.", files[i]), LogLevel.Information));
+                    Logger.Log(S._("{0} did not have its cluster tips erased because you do not " +
+                        "have the required permissions to erase the file cluster tips.", files[i]),
+                        LogLevel.Information);
                 }
                 catch (IOException e)
                 {
-                    log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have its " +
-                        "cluster tips erased. The error returned was: {1}", files[i],
-                        e.Message), LogLevel.Error));
+                    Logger.Log(S._("{0} did not have its cluster tips erased. The error returned " +
+                        "was: {1}", files[i], e.Message), LogLevel.Error);
                 }
                 finally
@@ -194 +192 @@
                     streamInfo.Attributes = fileAttr;
                 }
+
                 eraseCallback(i, files.Count, files[i]);
             }
         }
 
-        private void ListFiles(DirectoryInfo info, List<string> files, Logger log,
+        private void ListFiles(DirectoryInfo info, List<string> files,
             ClusterTipsSearchProgress searchCallback)
         {
@@ -206 +205 @@
                 if ((info.Attributes & FileAttributes.ReparsePoint) != 0)
                 {
-                    log.LastSessionEntries.Add(new LogEntry(S._("Files in {0} did " +
-                        "not have their cluster tips erased because it is a hard link or " +
-                        "a symbolic link.", info.FullName), LogLevel.Information));
+                    Logger.Log(S._("Files in {0} did not have their cluster tips erased because " +
+                        "it is a hard link or a symbolic link.", info.FullName),
+                        LogLevel.Information);
                     return;
                 }
@@ -214 +213 @@
                 foreach (FileInfo file in info.GetFiles())
                     if (file.IsProtectedSystemFile())
-                        log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have " +
-                            "its cluster tips erased, because it is a system file",
-                            file.FullName), LogLevel.Information));
+                        Logger.Log(S._("{0} did not have its cluster tips erased, because it is " +
+                            "a system file", file.FullName), LogLevel.Information);
                     else if ((file.Attributes & FileAttributes.ReparsePoint) != 0)
-                        log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have " +
-                            "its cluster tips erased because it is a hard link or a " +
-                            "symbolic link.", file.FullName), LogLevel.Information));
+                        Logger.Log(S._("{0} did not have its cluster tips erased because it is a " +
+                            "hard link or a symbolic link.", file.FullName), LogLevel.Information);
                     else if ((file.Attributes & FileAttributes.Compressed) != 0 ||
                         (file.Attributes & FileAttributes.Encrypted) != 0 ||
                         (file.Attributes & FileAttributes.SparseFile) != 0)
                     {
-                        log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have " +
-                            "its cluster tips erased because it is compressed, encrypted " +
-                            "or a sparse file.", file.FullName), LogLevel.Information));
+                        Logger.Log(S._("{0} did not have its cluster tips erased because it is " +
+                            "compressed, encrypted or a sparse file.", file.FullName),
+                            LogLevel.Information);
                     }
                     else
@@ -240 +237 @@
                         catch (UnauthorizedAccessException e)
                         {
-                            log.LastSessionEntries.Add(new LogEntry(S._("{0} did not " +
-                                "have its cluster tips erased because of the following " +
-                                "error: {1}", info.FullName, e.Message), LogLevel.Error));
+                            Logger.Log(S._("{0} did not have its cluster tips erased because of " +
+                                "the following error: {1}", info.FullName, e.Message),
+                                LogLevel.Error);
                         }
                         catch (IOException e)
                         {
-                            log.LastSessionEntries.Add(new LogEntry(S._("{0} did not " +
-                                "have its cluster tips erased because of the following " +
-                                "error: {1}", info.FullName, e.Message), LogLevel.Error));
+                            Logger.Log(S._("{0} did not have its cluster tips erased because of " +
+                                "the following error: {1}", info.FullName, e.Message),
+                                LogLevel.Error);
                         }
                     }
@@ -255 +252 @@
                 {
                     searchCallback(subDirInfo.FullName);
-                    ListFiles(subDirInfo, files, log, searchCallback);
+                    ListFiles(subDirInfo, files, searchCallback);
                 }
             }
             catch (UnauthorizedAccessException e)
             {
-                log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have its " +
-                    "cluster tips erased because of the following error: {1}",
-                    info.FullName, e.Message), LogLevel.Error));
+                Logger.Log(S._("{0} did not have its cluster tips erased because of the " +
+                    "following error: {1}", info.FullName, e.Message), LogLevel.Error);
             }
             catch (IOException e)
             {
-                log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have its " +
-                    "cluster tips erased because of the following error: {1}",
-                    info.FullName, e.Message), LogLevel.Error));
+                Logger.Log(S._("{0} did not have its cluster tips erased because of the " +
+                    "following error: {1}", info.FullName, e.Message), LogLevel.Error);
             }
         }