Browse Source

- Declare new ServiceBus instance with "AzureServiceBus" boolean condition

- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
pull/235/head
Christian Arenas 7 years ago
parent
commit
7980c2679d
3 changed files with 51 additions and 10 deletions
  1. +1
    -0
      src/Services/Ordering/Ordering.API/Ordering.API.csproj
  2. +47
    -9
      src/Services/Ordering/Ordering.API/Startup.cs
  3. +3
    -1
      src/Services/Ordering/Ordering.API/settings.json

+ 1
- 0
src/Services/Ordering/Ordering.API/Ordering.API.csproj View File

@ -24,6 +24,7 @@
<ItemGroup>
<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" />
<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" />
<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" />
<ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" />


+ 47
- 9
src/Services/Ordering/Ordering.API/Startup.cs View File

@ -12,10 +12,12 @@
using Infrastructure.Services;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Azure.ServiceBus;
using Microsoft.EntityFrameworkCore;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus;
using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services;
using Microsoft.Extensions.Configuration;
@ -113,20 +115,33 @@
var serviceProvider = services.BuildServiceProvider();
services.AddTransient<IOrderingIntegrationEventService, OrderingIntegrationEventService>();
services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
if (Configuration.GetValue<bool>("AzureServiceBus"))
{
var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
services.AddSingleton<IServiceBusPersisterConnection>(sp =>
{
var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();
var serviceBusConnection = new ServiceBusConnectionStringBuilder(Configuration["ServiceBusConnection"]);
var factory = new ConnectionFactory()
return new DefaultServiceBusPersisterConnection(serviceBusConnection, TimeSpan.FromSeconds(5), RetryPolicy.Default, logger);
});
}
else
{
services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
{
HostName = Configuration["EventBusConnection"]
};
var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
return new DefaultRabbitMQPersistentConnection(factory, logger);
});
var factory = new ConnectionFactory()
{
HostName = Configuration["EventBusConnection"]
};
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
services.AddSingleton<IEventBus, EventBusRabbitMQ>();
return new DefaultRabbitMQPersistentConnection(factory, logger);
});
}
RegisterServiceBus(services);
services.AddOptions();
@ -174,5 +189,28 @@
RequireHttpsMetadata = false
});
}
private void RegisterServiceBus(IServiceCollection services)
{
if (Configuration.GetValue<bool>("AzureServiceBus"))
{
services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
{
var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
var subscriptionClientName = "Ordering";
return new EventBusServiceBus(serviceBusPersisterConnection, logger,
eventBusSubcriptionsManager, subscriptionClientName);
});
}
else
{
services.AddSingleton<IEventBus, EventBusRabbitMQ>();
}
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
}
}
}

+ 3
- 1
src/Services/Ordering/Ordering.API/settings.json View File

@ -8,5 +8,7 @@
"System": "Information",
"Microsoft": "Information"
}
}
},
"ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus",
"AzureServiceBus": "true"
}

Loading…
Cancel
Save