fine tunning

Author: klesteb

ServiceSpooler/Processors/Monitor.cs

@@ -78,11 +78,10 @@ public void Start() {
 
             if (! cancellation.IsCancellationRequested) {
 
-                ProcessOrphans(null, null);
-
                 monitorTimer = new System.Timers.Timer(monitorInterval * 1000);
                 monitorTimer.Elapsed += ProcessOrphans;
-                monitorTimer.Start();
+
+                ProcessOrphans(null, null);
 
             }
 
@@ -157,11 +156,10 @@ private void ProcessOrphans(object sender, EventArgs args) {
 
             log.Trace("Entering ProcessOrphans()");
 
-            cancellation = new CancellationTokenSource();
-
-            ConnectionEvent.Wait(cancellation.Token);
+            try {
 
-            if (! cancellation.IsCancellationRequested) {
+                monitorTimer.Stop();
+                ConnectionEvent.Wait(cancellation.Token);
 
                 foreach (Watcher watcher in DirectoryWatchers.Values) {
 
@@ -175,6 +173,16 @@ private void ProcessOrphans(object sender, EventArgs args) {
 
                 tasks.Clear();
 
+                monitorTimer.Start();
+
+            } catch (OperationCanceledException) {
+
+                log.Debug("ProcessOrphans() - Ignored an OperationCanceledException");
+
+            } catch (Exception ex) {
+
+                log.Debug(String.Format("ProcessOrphans() - Ignored an Exception: {0}", ex));
+
             }
 
             log.Trace("Leaving ProcessOrphans()");
@@ -191,20 +199,25 @@ private void EnqueueOrphans(Watcher watcher) {
             log.Trace("Entering EnqueueOrphans()");
             log.Debug(String.Format("EnqueueOrphans() - processing {0}", watcher.directory));
 
-            var files = watcher.spool.Scan();
+            try {
 
-            log.Debug(String.Format("EnqueueOrphans() - found {0} files in {1}", files.Count(), watcher.directory));
+                var files = watcher.spool.Scan();
 
-            foreach (string file in files) {
+                log.Debug(String.Format("EnqueueOrphans() - found {0} files in {1}", files.Count(), watcher.directory));
 
-                if (cancellation.IsCancellationRequested) {
+                foreach (string file in files) {
 
-                    log.Debug("EnqueueOrphans() - cancellation requested");
-                    break;
+                    OnEnqueuePacket(file);
 
                 }
 
-                OnEnqueuePacket(file);
+            } catch (OperationCanceledException) {
+
+                log.Debug("EnqueueOrphans() - Ignored an OperationCanceledException");
+
+            } catch (Exception ex) {
+
+                log.Debug(String.Format("EnqueueOrphans() - Ignored an Exception: {0}", ex));
 
             }