stop exception swallowing during topology setup

Particular · Jul 8, 2020 · c0d1471 · c0d1471
1 parent b022491
commit c0d1471
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/src/NServiceBus.Transport.RabbitMQ/Routing/ConventionalRoutingTopology.cs b/src/NServiceBus.Transport.RabbitMQ/Routing/ConventionalRoutingTopology.cs
@@ -43,17 +43,8 @@ public void SetupSubscription(IModel channel, Type type, string subscriberName)
         }
 
         public void TeardownSubscription(IModel channel, Type type, string subscriberName)
-        {
-            try
-            {
-                channel.ExchangeUnbind(subscriberName, ExchangeName(type), string.Empty, null);
-            }
-            // ReSharper disable EmptyGeneralCatchClause
-            catch (Exception)
-            // ReSharper restore EmptyGeneralCatchClause
-            {
-                // TODO: Any better way to make this idempotent?
-            }
+        { 
+            channel.ExchangeUnbind(subscriberName, ExchangeName(type), string.Empty, null);
         }
 
         public void Publish(IModel channel, Type type, OutgoingMessage message, IBasicProperties properties)
@@ -132,16 +123,7 @@ void CreateExchange(IModel channel, string exchangeName)
         {
             NameValidator.ThrowIfNameIsTooLong(exchangeName);
 
-            try
-            {
-                channel.ExchangeDeclare(exchangeName, ExchangeType.Fanout, useDurableExchanges);
-            }
-            // ReSharper disable EmptyGeneralCatchClause
-            catch (Exception)
-            // ReSharper restore EmptyGeneralCatchClause
-            {
-                // TODO: Any better way to make this idempotent?
-            }
+            channel.ExchangeDeclare(exchangeName, ExchangeType.Fanout, useDurableExchanges);
         }
 
         readonly ConcurrentDictionary<Type, string> typeTopologyConfiguredSet = new ConcurrentDictionary<Type, string>();

diff --git a/src/NServiceBus.Transport.RabbitMQ/Routing/DirectRoutingTopology.cs b/src/NServiceBus.Transport.RabbitMQ/Routing/DirectRoutingTopology.cs
@@ -68,16 +68,7 @@ void CreateExchange(IModel channel, string exchangeName)
                 return;
             }
 
-            try
-            {
-                channel.ExchangeDeclare(exchangeName, ExchangeType.Topic, useDurableExchanges);
-            }
-            // ReSharper disable EmptyGeneralCatchClause
-            catch (Exception)
-            // ReSharper restore EmptyGeneralCatchClause
-            {
-
-            }
+            channel.ExchangeDeclare(exchangeName, ExchangeType.Topic, useDurableExchanges);
         }
 
         string GetRoutingKeyForPublish(Type eventType) => conventions.RoutingKey(eventType);