[FIX] git merge error

HongDam-org · Oct 25, 2024 · 29bb8db · 29bb8db
1 parent 5132e6a
commit 29bb8db
Showing 1 changed file with 0 additions and 23 deletions.
diff --git a/backend/src/main/java/com/twtw/backend/config/rabbitmq/RabbitMQConfig.java b/backend/src/main/java/com/twtw/backend/config/rabbitmq/RabbitMQConfig.java
@@ -155,21 +155,8 @@ public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(
         final SimpleRabbitListenerContainerFactory factory =
                 new SimpleRabbitListenerContainerFactory();
         factory.setConnectionFactory(connectionFactory);
-<<<<<<< Updated upstream
-        factory.setConcurrentConsumers(20);
-        factory.setMaxConcurrentConsumers(200);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
         factory.setConcurrentConsumers(10);
         factory.setMaxConcurrentConsumers(50);
->>>>>>> 8093b8b ([FIX] thread pool size setting)
-=======
-=======
-        factory.setConcurrentConsumers(10);
-        factory.setMaxConcurrentConsumers(50);
->>>>>>> origin/feat/thread-pool-retry-backoff
         return factory;
     }
 
@@ -180,17 +167,7 @@ public SimpleRabbitListenerContainerFactory retryRabbitListenerContainerFactory(
                 new SimpleRabbitListenerContainerFactory();
         factory.setConnectionFactory(connectionFactory);
         factory.setConcurrentConsumers(5);
-<<<<<<< HEAD
-<<<<<<< HEAD
-        factory.setMaxConcurrentConsumers(50);
-=======
-        factory.setMaxConcurrentConsumers(25);
->>>>>>> Stashed changes
->>>>>>> 8093b8b ([FIX] thread pool size setting)
-=======
         factory.setMaxConcurrentConsumers(25);
->>>>>>> Stashed changes
->>>>>>> origin/feat/thread-pool-retry-backoff
         factory.setRetryTemplate(retryTemplate());
         return factory;
     }