working with the spooler

Author: klesteb

ServiceSpooler/Processors/PacketHandler.cs

@@ -220,53 +220,37 @@ public void DequeuePacket() {
             log.Trace("Entering DequeuePacket()");
             log.Debug("DequeuePacket() - connected, ready to process");
 
-            try {
+            for (;;) {
 
-                for (;;) {
+                try {
 
                     ConnectionEvent.Wait(cancellation.Token);
                     log.Debug("DequeuePacket() - after ConnectionEvent.Wait()");
-                    dequeueEvent.Wait(cancellation.Token);
 
+                    dequeueEvent.Wait(cancellation.Token);
                     log.Debug("DequeuePacket() - processing");
 
-                    if (cancellation.IsCancellationRequested) {
-
-                        log.Debug("DequeuePacket() - cancellation requested");
-                        goto fini;
-
-                    }
-
                     Packet packet;
 
                     while (queued.TryDequeue(out packet)) {
 
-                        if (cancellation.IsCancellationRequested) {
-
-                            log.Debug("DequeuePacket() - cancellation requested");
-                            goto fini;
-
-                        }
-
                         OnDequeuePacket(packet);
 
                     }
 
-                    dequeueEvent.Reset();
+                } catch (OperationCanceledException) {
 
-                }
+                    log.Debug("DequeuePacket() - Ignored an OperationCanceledException");
+                    break;
 
-                fini:;
+                } catch (Exception ex) {
 
-            } catch (OperationCanceledException) {
+                    handler.Errors(ex);
+                    break;
 
-                // ignore, the waits were canceled.
-
-                log.Debug("DequeuePacket() - Ignored but a OperationCanceledException was thrown");
-
-            } catch (Exception ex) {
+                }
 
-                handler.Exceptions(ex);
+                dequeueEvent.Reset();
 
             }
 

ServiceSpooler/ServiceSpooler.csproj

@@ -34,7 +34,7 @@
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />