Merge pull request #55 from airwareic/persistentQueue002

Added the ability to specify maximum # of attempts and age for queued items

Author: niemyjski

Source/Extras/ExceptionlessSection.cs

@@ -18,6 +18,12 @@ internal class ExceptionlessSection : ConfigurationSection {
         [ConfigurationProperty("enableLogging", DefaultValue = null)]
         public bool? EnableLogging { get { return (bool?)base["enableLogging"]; } set { base["enableLogging"] = value; } }
 
+        [ConfigurationProperty("queueMaxAge", DefaultValue = null)]
+        public TimeSpan? QueueMaxAge { get { return (TimeSpan?)base["queueMaxAge"]; } set { base["queueMaxAge"] = value; } }
+
+        [ConfigurationProperty("queueMaxAttempts", DefaultValue = null)]
+        public int? QueueMaxAttempts { get { return (int?)base["queueMaxAttempts"]; } set { base["queueMaxAttempts"] = value; } }
+
         [ConfigurationProperty("logPath")]
         public string LogPath { get { return base["logPath"] as string; } set { base["logPath"] = value; } }
 

Source/Extras/Extensions/ExceptionlessExtraConfigurationExtensions.cs

@@ -104,6 +104,12 @@ public static void ReadFromConfigSection(this ExceptionlessConfiguration config)
             if (section.EnableSSL.HasValue)
                 config.EnableSSL = section.EnableSSL.Value;
 
+            if (section.QueueMaxAge.HasValue)
+                config.QueueMaxAge = section.QueueMaxAge.Value;
+
+            if (section.QueueMaxAttempts.HasValue)
+                config.QueueMaxAttempts = section.QueueMaxAttempts.Value;
+
             if (!String.IsNullOrEmpty(section.StoragePath))
                 config.UseFolderStorage(section.StoragePath);
 

Source/Shared/Configuration/ExceptionlessConfiguration.cs

@@ -18,6 +18,8 @@ public class ExceptionlessConfiguration {
         private bool _configLocked;
         private string _apiKey;
         private string _serverUrl;
+        private TimeSpan _queueMaxAge;
+        private int _queueMaxAttempts;
         private int _submissionBatchSize;
         private ValidationResult _validationResult;
         private readonly List<string> _exclusions = new List<string>(); 
@@ -28,6 +30,8 @@ public ExceptionlessConfiguration(IDependencyResolver resolver) {
             SubmissionBatchSize = DEFAULT_SUBMISSION_BATCH_SIZE;
             Enabled = true;
             EnableSSL = true;
+            QueueMaxAge = TimeSpan.FromDays(7);
+            QueueMaxAttempts = 3;
             DefaultTags = new TagSet();
             DefaultData = new DataDictionary();
             Settings = new SettingsDictionary();
@@ -100,6 +104,16 @@ public string ApiKey {
         [ObsoleteAttribute("This property will be removed in a future release.")]
         public bool EnableSSL { get; set; }
 
+        /// <summary>
+        /// Maximum time (provided in days) that the queue will persist events
+        /// </summary>
+        public TimeSpan QueueMaxAge { get; set; }
+
+        /// <summary>
+        /// Maximum number of times the client will try to upload an event in the queue
+        /// </summary>
+        public int QueueMaxAttempts { get; set; }
+
         /// <summary>
         /// A default list of tags that will automatically be added to every report submitted to the server.
         /// </summary>

Source/Shared/Extensions/FileStorageExtensions.cs

@@ -12,17 +12,14 @@ public static void Enqueue(this IObjectStorage storage, string queueName, Event
             storage.SaveObject(String.Concat(queueName, "\\q\\", Guid.NewGuid().ToString("N"), ".0.json"), ev);
         }
 
-        public static void CleanupQueueFiles(this IObjectStorage storage, string queueName, TimeSpan? maxAge = null, int? maxAttempts = 3) {
-            if (!maxAge.HasValue)
-                maxAge = TimeSpan.FromDays(1);
-
-            if (!maxAttempts.HasValue || maxAttempts.Value <= 0)
-                maxAttempts = 3;
+        public static void CleanupQueueFiles(this IObjectStorage storage, string queueName, TimeSpan? maxAge = null, int? maxAttempts = null) {
+            maxAge = maxAge ?? TimeSpan.FromDays(7);
+            maxAttempts = maxAttempts ?? 3;
 
             foreach (var file in storage.GetObjectList(queueName + "\\q\\*", 500).ToList()) {
-                if (file.Created < DateTime.Now.Subtract(maxAge.Value))
+                if (DateTime.Now.Subtract(file.Created) > maxAge.Value)
                     storage.DeleteObject(file.Path);
-                if (GetAttempts(file) >= maxAttempts)
+                if (GetAttempts(file) >= maxAttempts.Value)
                     storage.DeleteObject(file.Path);
             }
         }

Source/Shared/Queue/DefaultEventQueue.cs

@@ -61,7 +61,7 @@ public void Process() {
             _processingQueue = true;
 
             try {
-                _storage.CleanupQueueFiles(_config.GetQueueName());
+                _storage.CleanupQueueFiles(_config.GetQueueName(), _config.QueueMaxAge, _config.QueueMaxAttempts);
                 _storage.ReleaseStaleLocks(_config.GetQueueName());
 
                 DateTime maxCreatedDate = DateTime.Now;