Skip to content

Commit 6fb9085

Browse files
ethanhannethanhann
committed
Get logger in the type where it is used
1 parent 9db6323 commit 6fb9085

File tree

8 files changed

+43
-35
lines changed

8 files changed

+43
-35
lines changed

‎IntegrationEngine.Core/Mail/MailClient.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using Common.Logging;
22
using IntegrationEngine.Core.Configuration;
33
using System;
4+
using System.IO;
45
using System.Net.Mail;
56
using System.Net.Sockets;
6-
using System.IO;
7-
using System.Text;
7+
using System.Reflection;
88

99
namespace IntegrationEngine.Core.Mail
1010
{
@@ -17,6 +17,7 @@ public class MailClient : IMailClient
1717
public MailClient()
1818
{
1919
SmtpClient = new SmtpClientAdapter();
20+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
2021
}
2122

2223
public MailClient (ILog log) : this()

‎IntegrationEngine.Core/Storage/ElasticsearchRepository.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using IntegrationEngine.Model;
33
using Nest;
44
using System;
5-
using System.Collections;
65
using System.Collections.Generic;
76
using System.Linq;
87
using System.Linq.Expressions;
8+
using System.Reflection;
99

1010
namespace IntegrationEngine.Core.Storage
1111
{
@@ -16,6 +16,7 @@ public class ElasticsearchRepository : IElasticsearchRepository
1616

1717
public ElasticsearchRepository()
1818
{
19+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
1920
}
2021

2122
public IEnumerable<TItem> SelectAll<TItem>() where TItem : class, IHasStringId

‎IntegrationEngine.Tests/EngineHostConfigurationTest.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public void Setup()
2525
{
2626
Subject.Container = UnityContainer = new UnityContainer();
2727
MockLog = new Mock<ILog>();
28+
Subject.Log = MockLog.Object;
2829
}
2930

3031
[Test]
@@ -42,7 +43,7 @@ public void ShouldSetupLogging()
4243

4344
Subject.SetupLogging();
4445

45-
Subject.Container.Resolve<ILog>();
46+
Assert.That(Subject.Log.GetType(), Is.EqualTo(typeof(Common.Logging.NLog.NLogLogger)));
4647
}
4748

4849
[Test]
@@ -71,7 +72,7 @@ public void ShouldSetupMailClient()
7172
{
7273
Subject.LoadConfiguration();
7374

74-
Subject.SetupMailClient(MockLog.Object);
75+
Subject.SetupMailClient();
7576

7677
Subject.Container.Resolve<IMailClient>();
7778
}
@@ -92,7 +93,7 @@ public void ShouldSetupElasticsearchRepository()
9293
Subject.LoadConfiguration();
9394
var mockElasticClient = new Mock<IElasticClient>();
9495

95-
Subject.SetupElasticsearchRepository(MockLog.Object, mockElasticClient.Object);
96+
Subject.SetupElasticsearchRepository(mockElasticClient.Object);
9697

9798
Subject.Container.Resolve<IElasticsearchRepository>();
9899
}
@@ -105,7 +106,7 @@ public void ShouldSetupMessageQueueListener()
105106
var mockElasticClient = new Mock<IElasticClient>();
106107
var mockIntegrationEngineContext = new Mock<IntegrationEngineContext>();
107108

108-
Subject.SetupMessageQueueListener(MockLog.Object, mockMailClient.Object, mockElasticClient.Object, mockIntegrationEngineContext.Object);
109+
Subject.SetupMessageQueueListener(mockMailClient.Object, mockElasticClient.Object, mockIntegrationEngineContext.Object);
109110

110111
Subject.Container.Resolve<IMessageQueueListener>();
111112
}
@@ -115,7 +116,7 @@ public void ShouldSetupMessageQueueClient()
115116
{
116117
Subject.LoadConfiguration();
117118

118-
Subject.SetupMessageQueueClient(MockLog.Object);
119+
Subject.SetupMessageQueueClient();
119120

120121
Subject.Container.Resolve<IMessageQueueClient>();
121122
}
@@ -129,7 +130,7 @@ public void ShouldSetupEngineScheduler()
129130
var mockElasticsearchRespository= new Mock<IElasticsearchRepository>();
130131
var mockMessageQueueClient = new Mock<IMessageQueueClient>();
131132

132-
Subject.SetupEngineScheduler(MockLog.Object, mockMessageQueueClient.Object, mockElasticsearchRespository.Object);
133+
Subject.SetupEngineScheduler(mockMessageQueueClient.Object, mockElasticsearchRespository.Object);
133134

134135
Subject.Container.Resolve<IEngineScheduler>();
135136
}

‎IntegrationEngine/EngineHostConfiguration.cs‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class EngineHostConfiguration : IDisposable
2525
public IUnityContainer Container { get; set; }
2626
public EngineConfiguration Configuration { get; set; }
2727
public IList<Type> IntegrationJobTypes { get; set; }
28+
public ILog Log { get; set; }
2829

2930
public EngineHostConfiguration()
3031
{
@@ -38,16 +39,16 @@ public void Configure(IList<Assembly> assembliesWithJobs)
3839
.Where(x => typeof(IIntegrationJob).IsAssignableFrom(x) && x.IsClass)
3940
.ToList();
4041
LoadConfiguration();
41-
var log = SetupLogging();
42+
SetupLogging();
4243
var dbContext = SetupDatabaseContext();
4344
SetupRScriptRunner();
4445
SetupDatabaseRepository(dbContext);
45-
var mailClient = SetupMailClient(log);
46+
var mailClient = SetupMailClient();
4647
var elasticClient = SetupElasticClient();
47-
var elasticsearchRepository = SetupElasticsearchRepository(log, elasticClient);
48-
var messageQueueClient = SetupMessageQueueClient(log);
49-
SetupEngineScheduler(log, messageQueueClient, elasticsearchRepository);
50-
SetupMessageQueueListener(log, mailClient, elasticClient, dbContext);
48+
var elasticsearchRepository = SetupElasticsearchRepository(elasticClient);
49+
var messageQueueClient = SetupMessageQueueClient();
50+
SetupEngineScheduler(messageQueueClient, elasticsearchRepository);
51+
SetupMessageQueueListener(mailClient, elasticClient, dbContext);
5152
SetupWebApi();
5253
}
5354

@@ -57,16 +58,14 @@ public void LoadConfiguration()
5758
Container.RegisterInstance<EngineConfiguration>(Configuration);
5859
}
5960

60-
public ILog SetupLogging()
61+
public void SetupLogging()
6162
{
6263
var config = Configuration.NLogAdapter;
6364
var properties = new NameValueCollection();
6465
properties["configType"] = config.ConfigType;
6566
properties["configFile"] = config.ConfigFile;
6667
Common.Logging.LogManager.Adapter = new NLogLoggerFactoryAdapter(properties);
67-
var log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
68-
Container.RegisterInstance<ILog>(log);
69-
return log;
68+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
7069
}
7170

7271
public IntegrationEngineContext SetupDatabaseContext()
@@ -87,23 +86,21 @@ public void SetupWebApi()
8786
IntegrationEngineApi.Start((new UriBuilder("http", config.HostName, config.Port)).Uri.AbsoluteUri);
8887
}
8988

90-
public IMailClient SetupMailClient(ILog log)
89+
public IMailClient SetupMailClient()
9190
{
9291
var mailClient = new MailClient() {
93-
MailConfiguration = Configuration.Mail,
94-
Log = log,
92+
MailConfiguration = Configuration.Mail
9593
};
9694
Container.RegisterInstance<IMailClient>(mailClient);
9795
return mailClient;
9896
}
9997

100-
public void SetupMessageQueueListener(ILog log, IMailClient mailClient, IElasticClient elasticClient, IntegrationEngineContext integrationEngineContext)
98+
public void SetupMessageQueueListener(IMailClient mailClient, IElasticClient elasticClient, IntegrationEngineContext integrationEngineContext)
10199
{
102100
var rabbitMqListener = new RabbitMQListener() {
103101
IntegrationJobTypes = IntegrationJobTypes,
104102
MessageQueueConnection = new MessageQueueConnection(Configuration.MessageQueue),
105103
MessageQueueConfiguration = Configuration.MessageQueue,
106-
Log = log,
107104
MailClient = mailClient,
108105
IntegrationEngineContext = integrationEngineContext,
109106
ElasticClient = elasticClient,
@@ -112,29 +109,26 @@ public void SetupMessageQueueListener(ILog log, IMailClient mailClient, IElastic
112109
rabbitMqListener.Listen();
113110
}
114111

115-
public IMessageQueueClient SetupMessageQueueClient(ILog log)
112+
public IMessageQueueClient SetupMessageQueueClient()
116113
{
117114
var messageQueueClient = new RabbitMQClient() {
118115
MessageQueueConnection = new MessageQueueConnection(Configuration.MessageQueue),
119116
MessageQueueConfiguration = Configuration.MessageQueue,
120-
Log = log,
121117
};
122118
Container.RegisterInstance<IMessageQueueClient>(messageQueueClient);
123119
return messageQueueClient;
124120
}
125121

126-
public void SetupEngineScheduler(ILog log, IMessageQueueClient messageQueueClient, IElasticsearchRepository elasticsearchRepository)
122+
public void SetupEngineScheduler(IMessageQueueClient messageQueueClient, IElasticsearchRepository elasticsearchRepository)
127123
{
128124
var engineScheduler = new EngineScheduler() {
129125
Scheduler = StdSchedulerFactory.GetDefaultScheduler(),
130126
IntegrationJobTypes = IntegrationJobTypes,
131127
MessageQueueClient = messageQueueClient,
132-
Log = log,
133128
};
134129
Container.RegisterInstance<IEngineScheduler>(engineScheduler);
135130
var engineSchedulerListener = new EngineSchedulerListener() {
136131
ElasticsearchRepository = elasticsearchRepository,
137-
Log = log,
138132
};
139133
engineScheduler.AddSchedulerListener(engineSchedulerListener);
140134
engineScheduler.Start();
@@ -146,7 +140,7 @@ public void SetupEngineScheduler(ILog log, IMessageQueueClient messageQueueClien
146140
foreach (var trigger in cronTriggers)
147141
engineScheduler.ScheduleJobWithTrigger(trigger);
148142
foreach(var cronTrigger in allCronTriggers.Where(x => string.IsNullOrWhiteSpace(x.CronExpressionString)))
149-
log.Warn(x => x("Cron expression for trigger ({0}) is null, empty, or whitespace.", cronTrigger.Id));
143+
Log.Warn(x => x("Cron expression for trigger ({0}) is null, empty, or whitespace.", cronTrigger.Id));
150144
}
151145

152146
public void SetupRScriptRunner()
@@ -164,14 +158,13 @@ public IElasticClient SetupElasticClient()
164158
return elasticClient;
165159
}
166160

167-
public IElasticsearchRepository SetupElasticsearchRepository(ILog log, IElasticClient elasticClient)
161+
public IElasticsearchRepository SetupElasticsearchRepository(IElasticClient elasticClient)
168162
{
169163
var elasticsearchRepository = new ElasticsearchRepository() {
170-
Log = log,
171164
ElasticClient = elasticClient,
172165
};
173166
if (!elasticsearchRepository.IsServerAvailable())
174-
log.Warn("Elasticsearch server does not appear to be available.");
167+
Log.Warn("Elasticsearch server does not appear to be available.");
175168
Container.RegisterInstance<IElasticsearchRepository>(elasticsearchRepository);
176169
return elasticsearchRepository;
177170
}

‎IntegrationEngine/MessageQueue/RabbitMQClient.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using RabbitMQ.Client.Exceptions;
66
using System;
77
using System.Collections.Generic;
8+
using System.Reflection;
89
using System.Text;
910

1011
namespace IntegrationEngine.MessageQueue
@@ -16,7 +17,9 @@ public class RabbitMQClient : IMessageQueueClient
1617
public ILog Log { get; set; }
1718

1819
public RabbitMQClient()
19-
{}
20+
{
21+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
22+
}
2023

2124
public void Publish<T>(T value, IDictionary<string, string> parameters)
2225
{

‎IntegrationEngine/MessageQueue/RabbitMQListener.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using System.Collections.Generic;
1212
using System.IO;
1313
using System.Linq;
14+
using System.Reflection;
1415
using System.Text;
1516
using System.Threading;
1617

@@ -32,6 +33,7 @@ public class RabbitMQListener : IMessageQueueListener
3233
public RabbitMQListener()
3334
{
3435
shouldTerminate = false;
36+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
3537
}
3638

3739
public void Dispose()

‎IntegrationEngine/Scheduler/EngineScheduler.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
using IntegrationEngine.MessageQueue;
44
using IntegrationEngine.Model;
55
using Quartz;
6-
using Quartz.Impl.Matchers;
76
using System;
87
using System.Collections.Generic;
98
using System.Linq;
9+
using System.Reflection;
1010

1111
namespace IntegrationEngine.Scheduler
1212
{
@@ -19,6 +19,7 @@ public class EngineScheduler : IEngineScheduler
1919

2020
public EngineScheduler()
2121
{
22+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
2223
}
2324

2425
public void Start()

‎IntegrationEngine/Scheduler/EngineSchedulerListener.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using IntegrationEngine.Core.Storage;
33
using Quartz;
44
using System;
5+
using System.Reflection;
56

67
namespace IntegrationEngine.Scheduler
78
{
@@ -10,6 +11,11 @@ public class EngineSchedulerListener : IEngineSchedulerListener
1011
public IElasticsearchRepository ElasticsearchRepository { get; set; }
1112
public ILog Log { get; set; }
1213

14+
public EngineSchedulerListener()
15+
{
16+
Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
17+
}
18+
1319
public void JobAdded(IJobDetail jobDetail)
1420
{
1521
}

0 commit comments

Comments
 (0)