Skip to content

Commit 4404985

Browse files
brought worker service back to barebones
1 parent 017ba5a commit 4404985

File tree

6 files changed

+40
-130
lines changed

6 files changed

+40
-130
lines changed

WorkerService/Dockerfile

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
FROM microsoft/dotnet:1.1.0-sdk-projectjson
2-
3-
COPY . ./app
4-
WORKDIR ./app
5-
RUN dotnet restore
1+
FROM microsoft/dotnet:1.1.2-sdk
2+
3+
COPY . /app
4+
5+
WORKDIR /app
6+
7+
RUN dotnet restore
8+
9+
RUN dotnet build -c Release
610

711
CMD ["dotnet", "run"]

WorkerService/Environment.cs

-31
This file was deleted.

WorkerService/EventProcessors/RolesEventProcessor.cs

-23
This file was deleted.

WorkerService/Program.cs

+13-64
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,35 @@
1-
using System.Reflection;
2-
using System.Threading.Tasks;
3-
using Amazon;
4-
using Amazon.DynamoDBv2;
5-
using Amazon.Kinesis;
1+
using System;
2+
using System.IO;
63
using Microsoft.Extensions.Configuration;
74
using Serilog;
8-
using WorkerService.EventProcessors;
9-
using KinesisNet;
105
using static System.Threading.Thread;
116
using static System.Threading.Timeout;
127

138
namespace WorkerService
149
{
1510
public class Program
1611
{
17-
private static Environment environment;
18-
private static KManager kManager;
1912

2013
public static void Main(string[] args)
2114
{
22-
Log.Logger = new LoggerConfiguration()
23-
.MinimumLevel.Debug()
24-
.WriteTo.LiterateConsole()
25-
.CreateLogger();
26-
27-
Log.Debug("Testing debug logging");
15+
var configuration = new ConfigurationBuilder()
16+
.AddEnvironmentVariables()
17+
.AddCommandLine(args)
18+
.SetBasePath(Path.Combine(AppContext.BaseDirectory))
19+
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
20+
.Build();
2821

29-
environment = new Environment
30-
(
31-
System.Environment.GetEnvironmentVariable("REGION"),
32-
System.Environment.GetEnvironmentVariable("DC"),
33-
System.Environment.GetEnvironmentVariable("ENV"),
34-
typeof(Program)
35-
.GetTypeInfo()
36-
.Assembly
37-
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
38-
.InformationalVersion
39-
);
4022

41-
Log.Information("{@Environment}", environment);
23+
var logger = new LoggerConfiguration()
24+
.ReadFrom.Configuration(configuration)
25+
.CreateLogger();
4226

43-
Log.Information("Starting configuration");
27+
Log.Logger = logger;
4428

45-
var configuration = new ConfigurationBuilder()
46-
.AddEnvironmentVariables()
47-
.AddCommandLine(args)
48-
.Build();
29+
Console.WriteLine("Hello World");
4930

50-
StartListeningForEvents();
51-
52-
Log.Information("Going to sleep... zzzzz");
5331
// sleep indefinitely
5432
Sleep(Infinite);
55-
56-
StopListeningToEvents();
57-
}
58-
59-
private static void StopListeningToEvents()
60-
{
61-
kManager.Consumer.Stop();
62-
}
63-
64-
public static void StartListeningForEvents()
65-
{
66-
Log.Debug("Entering StartListeningForEvents");
67-
var kinesisStreamName = "RoleStream.LIVE";
68-
var kinesisWorkerId = Assembly.GetEntryAssembly().GetName().Name + "-" + environment.Env;
69-
70-
Log.Information("KManager variables:");
71-
Log.Information($" StreamName: {kinesisStreamName}");
72-
Log.Information($" WorkerId: {kinesisWorkerId}");
73-
74-
Log.Debug("Creating Dyanmo client");
75-
var dynamoClient = new AmazonDynamoDBClient(new AmazonDynamoDBConfig{RegionEndpoint = RegionEndpoint.GetBySystemName(environment.AwsRegion)});
76-
Log.Debug("Creating Kinesis client");
77-
var kinesisClient = new AmazonKinesisClient(new AmazonKinesisConfig{ RegionEndpoint = RegionEndpoint.GetBySystemName(environment.AwsRegion )});
78-
79-
Log.Debug("Starting Kmanager");
80-
kManager = new KManager(dynamoClient, kinesisClient, kinesisStreamName, kinesisWorkerId);
81-
82-
Log.Debug("Starting consumer");
83-
Task.Run(() => kManager.Consumer.Start(new RolesEventProcessor()));
8433
}
8534
}
8635
}

WorkerService/WorkerService.csproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@
1010
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
1111
</PropertyGroup>
1212

13+
<ItemGroup>
14+
<Content Include="appsettings.json">
15+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
16+
</Content>
17+
</ItemGroup>
18+
1319
<ItemGroup>
1420
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
1521
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
1622
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
1723
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
1824
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.4.13" />
1925
<PackageReference Include="AWSSDK.Kinesis" Version="3.3.2.4" />
20-
<PackageReference Include="Serilog" Version="2.4.0" />
21-
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
22-
<PackageReference Include="SeriLog.LogSanitizingFormatter" Version="1.0.1" />
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<ProjectReference Include="..\KinesisNet\KinesisNet.csproj" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
27+
<PackageReference Include="Serilog.Settings.Configuration" Version="2.4.0" />
2728
</ItemGroup>
2829

2930
</Project>

WorkerService/appsettings.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"Logging": {
3+
"IncludeScopes": false,
4+
"LogLevel": {
5+
"Default": "Verbose",
6+
"System": "Warning",
7+
"Microsoft": "Warning"
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)