Skip to content

Commit 0d86b89

Browse files
author
Stewart Miles
committed
Reduced verbosity of logging in FileUtils.RemoveAssets().
File groups in FileUtils.RemoveAssets() are now only logged if there are any files in a group (e.g file that were not removed). Change-Id: Id7c9c7aac6a6884d48038e07f64f61b02ae9cf02
1 parent 821d99c commit 0d86b89

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

source/VersionHandlerImpl/src/FileUtils.cs

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -558,13 +558,26 @@ public static RemoveAssetsResult RemoveAssets(IEnumerable<string> filenames,
558558
}
559559

560560
if(logger != null) {
561-
logger.Log(
562-
String.Format("Removed:\n{0}\nFailed to Remove:\n{1}\nMissing:\n{2}\n" +
563-
"Failed to Remove Folders:\n{3}\n",
564-
String.Join("\n", result.Removed.ToArray()),
565-
String.Join("\n", result.RemoveFailed.ToArray()),
566-
String.Join("\n", result.Missing.ToArray()),
567-
String.Join("\n", folderRemoveFailed.ToArray())), level : LogLevel.Verbose);
561+
var components = new List<string>();
562+
if (result.Removed.Count > 0) {
563+
components.Add(String.Format("Removed:\n{0}",
564+
String.Join("\n", result.Removed.ToArray())));
565+
}
566+
if (result.RemoveFailed.Count > 0) {
567+
components.Add(String.Format("Failed to Remove:\n{0}",
568+
String.Join("\n", result.RemoveFailed.ToArray())));
569+
}
570+
if (result.Missing.Count > 0) {
571+
components.Add(String.Format("Missing:\n{0}",
572+
String.Join("\n", result.Missing.ToArray())));
573+
}
574+
if (folderRemoveFailed.Count > 0) {
575+
components.Add(String.Format("Failed to Remove Folders:\n{0}",
576+
String.Join("\n", folderRemoveFailed.ToArray())));
577+
}
578+
if (components.Count > 0) {
579+
logger.Log(String.Join("\n", components.ToArray()), level: LogLevel.Verbose);
580+
}
568581
}
569582
return result;
570583
}

0 commit comments

Comments
 (0)