Skip to content
Snippets Groups Projects
Commit eb820789 authored by Niko Ehrenfeuchter's avatar Niko Ehrenfeuchter :keyboard:
Browse files

Provide count of expired subdirectories through ExpiredSubDirsCount

This way it can be updated with the common methods and simply be
retrieved upon demand, internally and externally.

Relates to #20
parent 2564a7ca
Branches
No related tags found
No related merge requests found
...@@ -50,6 +50,11 @@ namespace ATxCommon ...@@ -50,6 +50,11 @@ namespace ATxCommon
} }
} }
/// <summary>
/// Total number of expired (2nd-level) directories in the grace location.
/// </summary>
public int ExpiredSubDirsCount { get; private set; }
/// <summary> /// <summary>
/// Check if free space on all configured drives is above their threshold. /// Check if free space on all configured drives is above their threshold.
/// </summary> /// </summary>
...@@ -170,6 +175,7 @@ namespace ATxCommon ...@@ -170,6 +175,7 @@ namespace ATxCommon
Log.Debug("Updating storage status: checking grace location..."); Log.Debug("Updating storage status: checking grace location...");
_expiredDirs.Clear(); _expiredDirs.Clear();
ExpiredSubDirsCount = 0;
foreach (var userdir in _graceLocation.GetDirectories()) { foreach (var userdir in _graceLocation.GetDirectories()) {
Log.Trace("Scanning directory [{0}]", userdir.Name); Log.Trace("Scanning directory [{0}]", userdir.Name);
var expired = new List<DirectoryDetails>(); var expired = new List<DirectoryDetails>();
...@@ -182,6 +188,7 @@ namespace ATxCommon ...@@ -182,6 +188,7 @@ namespace ATxCommon
Log.Trace("Found expired directory [{0}]", dirDetails.Dir.Name); Log.Trace("Found expired directory [{0}]", dirDetails.Dir.Name);
expired.Add(dirDetails); expired.Add(dirDetails);
ExpiredSubDirsCount++;
} }
Log.Trace("Found {0} expired dirs.", expired.Count); Log.Trace("Found {0} expired dirs.", expired.Count);
if (expired.Count > 0) if (expired.Count > 0)
...@@ -192,12 +199,8 @@ namespace ATxCommon ...@@ -192,12 +199,8 @@ namespace ATxCommon
if (_expiredDirs.Count == 0) if (_expiredDirs.Count == 0)
return; return;
var detailCount = 0; Log.Debug("Updated grace location status: {0} top-level dirs with a total of {1}" +
foreach (var toplevel in _expiredDirs.Keys) { "expired sub-directories found.", _expiredDirs.Count, ExpiredSubDirsCount);
detailCount += _expiredDirs[toplevel].Count;
}
Log.Debug("Updated grace location status: {0} top-level directories with a total of " +
"{1} expired sub-directories found.", _expiredDirs.Count, detailCount);
} }
/// <summary> /// <summary>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment