Ramón Tomás
7 years ago
20 changed files with 113 additions and 337 deletions
Unified View
Diff Options
-
+0 -8docker-compose-windows.override.yml
-
+0 -7docker-compose-windows.prod.yml
-
+0 -9docker-compose-windows.yml
-
+0 -8docker-compose.override.yml
-
+0 -8docker-compose.prod.yml
-
+0 -9docker-compose.yml
-
+4 -52eShopOnContainers-ServicesAndWebApps.sln
-
+0 -3src/Services/GracePeriod/GracePeriodManager/.dockerignore
-
+0 -5src/Services/GracePeriod/GracePeriodManager/Dockerfile
-
+0 -8src/Services/GracePeriod/GracePeriodManager/Dockerfile.nanowin
-
+0 -36src/Services/GracePeriod/GracePeriodManager/GracePeriodManager.csproj
-
+0 -11src/Services/GracePeriod/GracePeriodManager/IntegrationEvents/Events/GracePeriodConfirmedIntegrationEvent.cs
-
+0 -130src/Services/GracePeriod/GracePeriodManager/Program.cs
-
+0 -7src/Services/GracePeriod/GracePeriodManager/Services/IManagerService.cs
-
+0 -15src/Services/GracePeriod/GracePeriodManager/appsettings.json
-
+41 -14src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/GracePeriodManagerService.cs
-
+4 -3src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/GracePeriodManagerSettings.cs
-
+48 -0src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/HostedService.cs
-
+10 -4src/Services/Ordering/Ordering.API/Startup.cs
-
+6 -0src/Services/Ordering/Ordering.API/graceperiodsettings.json
+ 0
- 8
docker-compose-windows.override.yml
View File
+ 0
- 7
docker-compose-windows.prod.yml
View File
+ 0
- 9
docker-compose-windows.yml
View File
+ 0
- 8
docker-compose.override.yml
View File
+ 0
- 8
docker-compose.prod.yml
View File
+ 0
- 9
docker-compose.yml
View File
+ 4
- 52
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 0
- 3
src/Services/GracePeriod/GracePeriodManager/.dockerignore
View File
| @ -1,3 +0,0 @@ | |||||
| * | |||||
| !obj/Docker/publish/* | |||||
| !obj/Docker/empty/ | |||||
+ 0
- 5
src/Services/GracePeriod/GracePeriodManager/Dockerfile
View File
| @ -1,5 +0,0 @@ | |||||
| FROM microsoft/aspnetcore:2.0 | |||||
| ARG source | |||||
| WORKDIR /app | |||||
| COPY ${source:-obj/Docker/publish} . | |||||
| ENTRYPOINT ["dotnet", "GracePeriodManager.dll"] | |||||
+ 0
- 8
src/Services/GracePeriod/GracePeriodManager/Dockerfile.nanowin
View File
| @ -1,8 +0,0 @@ | |||||
| FROM microsoft/dotnet:1.1-runtime-nanoserver | |||||
| SHELL ["powershell"] | |||||
| ARG source | |||||
| WORKDIR /app | |||||
| RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord | |||||
| EXPOSE 80 | |||||
| COPY ${source:-obj/Docker/publish} . | |||||
| ENTRYPOINT ["dotnet", "Basket.API.dll"] | |||||
+ 0
- 36
src/Services/GracePeriod/GracePeriodManager/GracePeriodManager.csproj
View File
| @ -1,36 +0,0 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk"> | |||||
| <PropertyGroup> | |||||
| <OutputType>Exe</OutputType> | |||||
| <TargetFramework>netcoreapp2.0</TargetFramework> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" /> | |||||
| <PackageReference Include="Dapper" Version="1.50.2" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" /> | |||||
| </ItemGroup> | |||||
| <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="..\..\Ordering\Ordering.Infrastructure\Ordering.Infrastructure.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update=".dockerignore"> | |||||
| <DependentUpon>Dockerfile</DependentUpon> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| </Project> | |||||
+ 0
- 11
src/Services/GracePeriod/GracePeriodManager/IntegrationEvents/Events/GracePeriodConfirmedIntegrationEvent.cs
View File
| @ -1,11 +0,0 @@ | |||||
| namespace GracePeriodManager.IntegrationEvents.Events | |||||
| { | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||||
| public class GracePeriodConfirmedIntegrationEvent : IntegrationEvent | |||||
| { | |||||
| public int OrderId { get;} | |||||
| public GracePeriodConfirmedIntegrationEvent(int orderId) => OrderId = orderId; | |||||
| } | |||||
| } | |||||
+ 0
- 130
src/Services/GracePeriod/GracePeriodManager/Program.cs
View File
| @ -1,130 +0,0 @@ | |||||
| namespace GracePeriodManager | |||||
| { | |||||
| using System.IO; | |||||
| using System; | |||||
| using System.Threading.Tasks; | |||||
| using Autofac.Extensions.DependencyInjection; | |||||
| using Autofac; | |||||
| using Microsoft.Extensions.Configuration; | |||||
| using Microsoft.Extensions.DependencyInjection; | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ; | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using Microsoft.Extensions.Options; | |||||
| using RabbitMQ.Client; | |||||
| using Services; | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus; | |||||
| using Microsoft.Azure.ServiceBus; | |||||
| public class Program | |||||
| { | |||||
| public static IConfigurationRoot Configuration { get; set; } | |||||
| public static void Main(string[] args) => MainAsync().Wait(); | |||||
| static async Task MainAsync() | |||||
| { | |||||
| StartUp(); | |||||
| IServiceCollection services = new ServiceCollection(); | |||||
| var serviceProvider = ConfigureServices(services); | |||||
| var logger = serviceProvider.GetService<ILoggerFactory>(); | |||||
| Configure(logger); | |||||
| var gracePeriodManagerService = serviceProvider | |||||
| .GetRequiredService<IManagerService>(); | |||||
| var checkUpdateTime = serviceProvider | |||||
| .GetRequiredService<IOptions<ManagerSettings>>().Value.CheckUpdateTime; | |||||
| while (true) | |||||
| { | |||||
| gracePeriodManagerService.CheckConfirmedGracePeriodOrders(); | |||||
| await Task.Delay(checkUpdateTime); | |||||
| } | |||||
| } | |||||
| public static void StartUp() | |||||
| { | |||||
| var builder = new ConfigurationBuilder() | |||||
| .SetBasePath(Directory.GetCurrentDirectory()) | |||||
| .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) | |||||
| .AddEnvironmentVariables(); | |||||
| Configuration = builder.Build(); | |||||
| } | |||||
| public static IServiceProvider ConfigureServices(IServiceCollection services) | |||||
| { | |||||
| services.AddLogging() | |||||
| .AddOptions() | |||||
| .Configure<ManagerSettings>(Configuration) | |||||
| .AddSingleton<IManagerService, ManagerService>(); | |||||
| if (Configuration.GetValue<bool>("AzureServiceBusEnabled")) | |||||
| { | |||||
| services.AddSingleton<IServiceBusPersisterConnection>(sp => | |||||
| { | |||||
| var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>(); | |||||
| var serviceBusConnectionString = Configuration["EventBusConnection"]; | |||||
| var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString); | |||||
| return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); | |||||
| }); | |||||
| } | |||||
| else | |||||
| { | |||||
| services.AddSingleton<IRabbitMQPersistentConnection>(sp => | |||||
| { | |||||
| var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>(); | |||||
| var factory = new ConnectionFactory() | |||||
| { | |||||
| HostName = Configuration["EventBusConnection"] | |||||
| }; | |||||
| return new DefaultRabbitMQPersistentConnection(factory, logger); | |||||
| }); | |||||
| } | |||||
| RegisterEventBus(services); | |||||
| var container = new ContainerBuilder(); | |||||
| container.Populate(services); | |||||
| return new AutofacServiceProvider(container.Build()); | |||||
| } | |||||
| public static void Configure(ILoggerFactory loggerFactory) | |||||
| { | |||||
| loggerFactory | |||||
| .AddConsole(Configuration.GetSection("Logging")) | |||||
| .AddConsole(LogLevel.Debug); | |||||
| } | |||||
| private static void RegisterEventBus(IServiceCollection services) | |||||
| { | |||||
| if (Configuration.GetValue<bool>("AzureServiceBusEnabled")) | |||||
| { | |||||
| services.AddSingleton<IEventBus, EventBusServiceBus>(sp => | |||||
| { | |||||
| var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>(); | |||||
| var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>(); | |||||
| var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>(); | |||||
| var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>(); | |||||
| var subscriptionClientName = Configuration["SubscriptionClientName"]; | |||||
| return new EventBusServiceBus(serviceBusPersisterConnection, logger, | |||||
| eventBusSubcriptionsManager, subscriptionClientName, iLifetimeScope); | |||||
| }); | |||||
| } | |||||
| else | |||||
| { | |||||
| services.AddSingleton<IEventBus, EventBusRabbitMQ>(); | |||||
| } | |||||
| services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>(); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 7
src/Services/GracePeriod/GracePeriodManager/Services/IManagerService.cs
View File
| @ -1,7 +0,0 @@ | |||||
| namespace GracePeriodManager.Services | |||||
| { | |||||
| public interface IManagerService | |||||
| { | |||||
| void CheckConfirmedGracePeriodOrders(); | |||||
| } | |||||
| } | |||||
+ 0
- 15
src/Services/GracePeriod/GracePeriodManager/appsettings.json
View File
| @ -1,15 +0,0 @@ | |||||
| { | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Debug", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", | |||||
| "GracePeriodTime": "1", | |||||
| "CheckUpdateTime": "30000", | |||||
| "AzureServiceBusEnabled": false, | |||||
| "SubscriptionClientName": "GracePeriod" | |||||
| } | |||||
src/Services/GracePeriod/GracePeriodManager/Services/ManagerService.cs → src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/GracePeriodManagerService.cs
View File
src/Services/GracePeriod/GracePeriodManager/ManagerSettings.cs → src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/GracePeriodManagerSettings.cs
View File
+ 48
- 0
src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/HostedService.cs
View File
| @ -0,0 +1,48 @@ | |||||
| using Microsoft.Extensions.Hosting; | |||||
| using System.Threading; | |||||
| using System.Threading.Tasks; | |||||
| namespace Ordering.API.Infrastructure.HostedServices | |||||
| { | |||||
| public abstract class HostedService : IHostedService | |||||
| { | |||||
| // Example untested base class code kindly provided by David Fowler: https://gist.github.com/davidfowl/a7dd5064d9dcf35b6eae1a7953d615e3 | |||||
| private Task _executingTask; | |||||
| private CancellationTokenSource _cts; | |||||
| public Task StartAsync(CancellationToken cancellationToken) | |||||
| { | |||||
| // Create a linked token so we can trigger cancellation outside of this token's cancellation | |||||
| _cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); | |||||
| // Store the task we're executing | |||||
| _executingTask = ExecuteAsync(_cts.Token); | |||||
| // If the task is completed then return it, otherwise it's running | |||||
| return _executingTask.IsCompleted ? _executingTask : Task.CompletedTask; | |||||
| } | |||||
| public async Task StopAsync(CancellationToken cancellationToken) | |||||
| { | |||||
| // Stop called without start | |||||
| if (_executingTask == null) | |||||
| { | |||||
| return; | |||||
| } | |||||
| // Signal cancellation to the executing method | |||||
| _cts.Cancel(); | |||||
| // Wait until the task completes or the stop token triggers | |||||
| await Task.WhenAny(_executingTask, Task.Delay(-1, cancellationToken)); | |||||
| // Throw if cancellation triggered | |||||
| cancellationToken.ThrowIfCancellationRequested(); | |||||
| } | |||||
| // Derived classes should override this and execute a long running method until | |||||
| // cancellation is requested | |||||
| protected abstract Task ExecuteAsync(CancellationToken cancellationToken); | |||||
| } | |||||
| } | |||||
+ 10
- 4
src/Services/Ordering/Ordering.API/Startup.cs
View File
+ 6
- 0
src/Services/Ordering/Ordering.API/graceperiodsettings.json
View File
| @ -0,0 +1,6 @@ | |||||
| { | |||||
| "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", | |||||
| "GracePeriodTime": "1", | |||||
| "CheckUpdateTime": "30000" | |||||
| } | |||||