From 1f65e45726cb168ce1c9eddc72f6a41c0a1d2316 Mon Sep 17 00:00:00 2001
From: Eric Fontana <efontana@vistaprint.com>
Date: Fri, 19 Dec 2014 10:19:21 -0500
Subject: [PATCH] Fixed shutdown problem.

---
 README.md                         |  2 +-
 TimberWinR/Inputs/LogsListener.cs | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 323e394..fc0c5f3 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The current list of supported filters are:
 Note that there are now two syntaxes for filters, array and single, if you want more than one filter of the same
 type then you must use the array tag instead of the singular tag. i.e:
 
-A single Json filter using the single tag
+A single Json filter using the single tag (this is only provided as a convienience, the array syntax is preferred)
 ```json
 "Filters": [          
     {
diff --git a/TimberWinR/Inputs/LogsListener.cs b/TimberWinR/Inputs/LogsListener.cs
index cee930d..78c515b 100644
--- a/TimberWinR/Inputs/LogsListener.cs
+++ b/TimberWinR/Inputs/LogsListener.cs
@@ -58,7 +58,7 @@ namespace TimberWinR.Inputs
         public override void Shutdown()
         {
             LogManager.GetCurrentClassLogger().Info("Shutting Down {0}", InputType);
-            Stop = true;              
+            Stop = true;
             base.Shutdown();
         }
 
@@ -75,19 +75,19 @@ namespace TimberWinR.Inputs
                         new JProperty("recurse", _arguments.Recurse),
                         new JProperty("files",
                             new JArray(from f in _logFileMaxRecords.Keys
-                                select new JValue(f))),
+                                       select new JValue(f))),
                         new JProperty("fileSampleTimes",
                             new JArray(from f in _logFileSampleTimes.Values
-                                select new JValue(f))),
+                                       select new JValue(f))),
                         new JProperty("fileSizes",
                             new JArray(from f in _logFileSizes.Values
-                                select new JValue(f))),
+                                       select new JValue(f))),
                         new JProperty("fileIndices",
                             new JArray(from f in _logFileMaxRecords.Values
-                                select new JValue(f))),
+                                       select new JValue(f))),
                         new JProperty("fileCreationDates",
                             new JArray(from f in _logFileCreationTimes.Values
-                                select new JValue(f)))
+                                       select new JValue(f)))
                         )));
 
             return json;
@@ -143,7 +143,7 @@ namespace TimberWinR.Inputs
                                     var qcount = string.Format("SELECT max(Index) as MaxRecordNumber FROM {0}", logName);
                                     var rcount = oLogQuery.Execute(qcount, iFmt);
                                     var qr = rcount.getRecord();
-                                    var lrn = (Int64) qr.getValueEx("MaxRecordNumber");                                    
+                                    var lrn = (Int64)qr.getValueEx("MaxRecordNumber");
                                     if (logHasRolled)
                                     {
                                         LogManager.GetCurrentClassLogger().Info("Log {0} has rolled", logName);
@@ -189,7 +189,7 @@ namespace TimberWinR.Inputs
                                         }
 
                                         object v = record.getValue(field.Name);
-                                        if (field.DataType == typeof (DateTime))
+                                        if (field.DataType == typeof(DateTime))
                                         {
                                             DateTime dt = DateTime.Parse(v.ToString());
                                             json.Add(new JProperty(field.Name, dt));
@@ -204,7 +204,7 @@ namespace TimberWinR.Inputs
                                         _receivedMessages++;
                                     }
 
-                                    var lrn = (Int64) record.getValueEx("Index");
+                                    var lrn = (Int64)record.getValueEx("Index");
                                     _logFileMaxRecords[fileName] = lrn;
                                     GC.Collect();
                                 }
@@ -213,14 +213,16 @@ namespace TimberWinR.Inputs
                                 // Close the recordset
                                 rs.close();
                                 rs = null;
-                                GC.Collect();                             
+                                GC.Collect();
                             }
+                            // Sleep 
+                            syncHandle.Wait(TimeSpan.FromSeconds(_pollingIntervalInSeconds), _cancelToken);
                         }
-                        catch(FileNotFoundException fnfex)
+                        catch (FileNotFoundException fnfex)
                         {
                             LogManager.GetCurrentClassLogger().Warn(fnfex.Message);
                         }
-                        catch(OperationCanceledException oce)
+                        catch (OperationCanceledException oce)
                         {
                             break;
                         }
@@ -232,7 +234,6 @@ namespace TimberWinR.Inputs
                         {
                             oLogQuery = null;
                         }
-                        syncHandle.Wait(TimeSpan.FromSeconds(_pollingIntervalInSeconds), _cancelToken);
                     }
                 }
                 Finished();