Update examples to match the latest code.

ifgris · Jan 9, 2024 · b9409fb · b9409fb
1 parent 3385406
commit b9409fb
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 29 deletions.
diff --git a/Example/Example.Autofac/ConsumeService.cs b/Example/Example.Autofac/ConsumeService.cs
@@ -6,10 +6,10 @@ namespace Example.Autofac;
 public class ConsumeService : RabbitSubscriber
 {
     private readonly ILogger<RabbitSubscriber>? _logger;
-    
-    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+
+    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName) : base(consumer, logger, consumerName)
     {
-        SetConsumer("FooFirstQueueConsumer");
+        _logger = logger;
     }
 
     protected override bool HandleMessage(string message)

diff --git a/Example/Example.Autofac/Program.cs b/Example/Example.Autofac/Program.cs
@@ -88,5 +88,5 @@ IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args)
 
         // register BackgroundService
         services.AddHostedService<PublishService>();
-        services.AddHostedService<ConsumeService>();
+        services.AddRabbitSubscriber<ConsumeService>("FooFirstQueueConsumer");
     });
diff --git a/Example/Example.ConsumerQuickStart/ConsumeService.cs b/Example/Example.ConsumerQuickStart/ConsumeService.cs
@@ -5,9 +5,8 @@ namespace Example.ConsumerQuickStart;
 
 public class ConsumeService : RabbitSubscriber
 {
-    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName) : base(consumer, logger, consumerName)
     {
-        SetConsumer("FooSecondQueueConsumer");
     }
 
     // protected override bool HandleMessage(string message)

diff --git a/Example/Example.ConsumerQuickStart/Program.cs b/Example/Example.ConsumerQuickStart/Program.cs
@@ -17,6 +17,6 @@
     }
 });
 
-var consumeService = new ConsumeService(consumer, null);
+var consumeService = new ConsumeService(consumer, null, "FooSecondQueueConsumer");
 
 consumeService.StartAsync(CancellationToken.None);
diff --git a/Example/Example.MultiConsumers/FirstConsumeService.cs b/Example/Example.MultiConsumers/FirstConsumeService.cs
@@ -6,13 +6,12 @@ namespace Example.MultiConsumers;
 public class FirstConsumeService : RabbitSubscriber
 {
     private readonly ILogger<RabbitSubscriber>? _logger;
-    
-    public FirstConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+
+    public FirstConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName) : base(consumer, logger, consumerName)
     {
         _logger = logger;
-        SetConsumer("FooFirstQueueConsumer");
     }
-    
+
     protected override bool HandleMessage(string message)
     {
         _logger?.LogInformation(message);

diff --git a/Example/Example.MultiConsumers/Program.cs b/Example/Example.MultiConsumers/Program.cs
@@ -40,8 +40,8 @@
 logger.LogInformation("Program init");
 
 // register BackgroundService
-builder.Services.AddHostedService<FirstConsumeService>();
-builder.Services.AddHostedService<SecondConsumeService>();
+builder.Services.AddRabbitSubscriber<FirstConsumeService>("FooFirstQueueConsumer");
+builder.Services.AddRabbitSubscriber<SecondConsumeService>("FooSecondQueueConsumer");
 
 using IHost host = builder.Build();
 

diff --git a/Example/Example.MultiConsumers/SecondConsumeService.cs b/Example/Example.MultiConsumers/SecondConsumeService.cs
@@ -8,9 +8,8 @@ public class SecondConsumeService : RabbitSubscriber
 {
     private readonly IRabbitConsumer _consumer;
 
-    public SecondConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+    public SecondConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName) : base(consumer, logger, consumerName)
     {
         _consumer = consumer;
-        SetConsumer("FooSecondQueueConsumer");
     }
 }
diff --git a/Example/Example.NLog/ConsumeService.cs b/Example/Example.NLog/ConsumeService.cs
@@ -6,10 +6,10 @@ namespace Example.NLog;
 public class ConsumeService : RabbitSubscriber
 {
     private readonly ILogger<RabbitSubscriber>? _logger;
-    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+
+    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName) : base(consumer, logger, consumerName)
     {
         _logger = logger;
-        SetConsumer("FooFirstQueueConsumer");
     }
 
     protected override bool HandleMessage(string message)

diff --git a/Example/Example.NLog/Program.cs b/Example/Example.NLog/Program.cs
@@ -98,5 +98,5 @@ IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args)
 
         // register BackgroundService
         services.AddHostedService<PublishService>();
-        services.AddHostedService<ConsumeService>();
+        services.AddRabbitSubscriber<ConsumeService>("FooFirstQueueConsumer");
     });
diff --git a/Example/Example.ProducerInConsumer/ConsumeService.cs b/Example/Example.ProducerInConsumer/ConsumeService.cs
@@ -8,10 +8,9 @@ public class ConsumeService : RabbitSubscriber
 {
     private readonly IRabbitProducer _producer;
 
-    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, IRabbitProducer producer) : base(consumer, logger)
+    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName, IRabbitProducer producer) : base(consumer, logger, consumerName)
     {
         _producer = producer;
-        SetConsumer("BarFirstQueueConsumer");
     }
 
     protected override bool HandleMessage(string message)

diff --git a/Example/Example.ProducerInConsumer/Program.cs b/Example/Example.ProducerInConsumer/Program.cs
@@ -50,7 +50,7 @@
 logger.LogInformation("Program init");
 
 // register BackgroundService
-builder.Services.AddHostedService<ConsumeService>();
+builder.Services.AddRabbitSubscriber<ConsumeService>("BarFirstQueueConsumer");
 
 using IHost host = builder.Build();
 

diff --git a/Example/Example.ReadSettings/ConsumeService.cs b/Example/Example.ReadSettings/ConsumeService.cs
@@ -7,10 +7,9 @@ public class ConsumeService : RabbitSubscriber
 {
     private readonly ILogger<RabbitSubscriber>? _logger;
 
-    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string? consumerName = null) : base(consumer, logger, consumerName)
     {
         _logger = logger;
-        SetConsumer("FooFirstQueueConsumer");
     }
 
     protected override bool HandleMessage(string message)

diff --git a/Example/Example.ReadSettings/Program.cs b/Example/Example.ReadSettings/Program.cs
@@ -23,10 +23,10 @@ IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args)
     })
     .ConfigureServices((context, services) =>
     {
-        services.AutoAddRabbitProducer(context.Configuration);
+        services.AutoAddRabbitProducer(context.Configuration, false);
         services.AutoAddRabbitConsumer(context.Configuration);
 
         // register BackgroundService
         services.AddHostedService<PublishService>();
-        services.AddHostedService<ConsumeService>();
+        services.AddRabbitSubscriber<ConsumeService>("FooFirstQueueConsumer", true);
     });
diff --git a/Example/Example.SimpleDI/ConsumeService.cs b/Example/Example.SimpleDI/ConsumeService.cs
@@ -6,11 +6,10 @@ namespace Example.SimpleDI;
 public class ConsumeService : RabbitSubscriber
 {
     private readonly ILogger<RabbitSubscriber>? _logger;
-    
-    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger) : base(consumer, logger)
+
+    public ConsumeService(IRabbitConsumer consumer, ILogger<RabbitSubscriber>? logger, string consumerName) : base(consumer, logger, consumerName)
     {
         _logger = logger;
-        SetConsumer("FooFirstQueueConsumer");
     }
 
     protected override bool HandleMessage(string message)

diff --git a/Example/Example.SimpleDI/Program.cs b/Example/Example.SimpleDI/Program.cs
@@ -79,7 +79,7 @@
 
 // register BackgroundService
 builder.Services.AddHostedService<PublishService>();
-builder.Services.AddHostedService<ConsumeService>();
+builder.Services.AddRabbitSubscriber<ConsumeService>("FooFirstQueueConsumer");
 
 using IHost host = builder.Build();