Improved error handling

dmidem · Jan 9, 2014 · 81dd42c · 81dd42c
1 parent d595112
commit 81dd42c
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/Exchposer/ExchangeServer.cs b/Exchposer/ExchangeServer.cs
@@ -188,28 +188,25 @@ public void StopStreamingNotifications()
         {
             restartTimer.Stop();
 
-            try
-            {
-                if (streamingSubscription != null)
+            if (streamingSubscription != null)
+                try
                 {
                     var tmpStreamingSubscription = streamingSubscription;
                     streamingSubscription = null;
                     tmpStreamingSubscription.Unsubscribe();
                 }
+                catch { }
 
-                if (subscriptionConnection != null)
+            if (subscriptionConnection != null)
+                try
                 {
                     if (subscriptionConnection.IsOpen)
                         subscriptionConnection.Close();
                     subscriptionConnection.Dispose();
                     subscriptionConnection = null;
                     Log(2, "Exchange subscription stopped");
                 }
-            }
-            catch (Exception ex)
-            {
-                Log(1, String.Format("Exchange subscription stopping error: {0}", ex.Message));
-            }
+                catch { }
         }
 
         public void RestartStreamingNotifications()
@@ -264,7 +261,7 @@ private void OnError(object sender, SubscriptionErrorEventArgs args)
             if (streamingSubscription == null)
                 return;
 
-            Log(3, String.Format("Exchange subscription error: {0} Restartting subscribtion...", args.Exception.Message));
+            Log(20, String.Format("Exchange subscription error: {0} Restartting subscribtion...", args.Exception.Message));
             RestartStreamingNotifications();
 /*
             try