Skip to content

Commit 94073b3

Browse files
committed
Refine logging internals and config
1 parent 7a2b152 commit 94073b3

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

IntegrationEngine.Core/Jobs/SqlJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public virtual IList<T> RunQuery<T>()
2929
}
3030
catch(ArgumentException exception)
3131
{
32-
Log.Error(exception.Message, exception);
32+
Log.Error(exception);
3333
}
3434
return new List<T>();
3535
}

IntegrationEngine.Core/Mail/MailClient.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ public MailClient (ILog log) : this()
2222
public void Send(MailMessage mailMessage)
2323
{
2424
ConfigureSmtpClient();
25-
try {
26-
25+
try
26+
{
2727
SmtpClient.Send(mailMessage);
28-
} catch (Exception exception) {
29-
Log.Error("Cannot send mail message", exception);
28+
}
29+
catch (Exception exception)
30+
{
31+
Log.Error(exception);
3032
}
3133
}
3234

IntegrationEngine/EngineHostConfiguration.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public void Configure(IList<Assembly> assembliesWithJobs)
3838
.SelectMany(x => x.GetTypes())
3939
.Where(x => typeof(IIntegrationJob).IsAssignableFrom(x) && x.IsClass)
4040
.ToList();
41-
TryAndLogFailure("Loading Configuration", LoadConfiguration);
42-
TryAndLogFailure("Setup Logging", SetupLogging);
41+
LoadConfiguration();
42+
SetupLogging();
4343
TryAndLogFailure("Setup Database Repository", SetupDatabaseRepository);
4444
TryAndLogFailure("Setup Mail Client", SetupMailClient);
4545
TryAndLogFailure("Setup Elastic Client", SetupElasticClient);
@@ -56,10 +56,10 @@ static void TryAndLogFailure(string description, Action action)
5656
{
5757
action();
5858
}
59-
catch (Exception ex)
59+
catch (Exception exception)
6060
{
6161
var log = Common.Logging.LogManager.GetLogger(typeof(EngineHost));
62-
log.Error(description, ex);
62+
log.Error(description, exception);
6363
}
6464
}
6565

@@ -97,7 +97,6 @@ public void SetupMailClient()
9797
MailConfiguration = Configuration.Mail,
9898
Log = Container.Resolve<ILog>(),
9999
};
100-
101100
Container.RegisterInstance<IMailClient>(mailClient);
102101
}
103102

IntegrationEngine/MessageQueue/RabbitMqListener.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public void Listen()
3535
var consumer = new QueueingBasicConsumer(channel);
3636
channel.BasicConsume(MessageQueueConfiguration.QueueName, true, consumer);
3737

38-
Log.Info("Waiting for messages...");
38+
Log.Info(x => x("Waiting for messages..."));
3939
while (true)
4040
{
4141
var eventArgs = (BasicDeliverEventArgs)consumer.Queue.Dequeue();
4242
var body = eventArgs.Body;
4343
var message = Encoding.UTF8.GetString(body);
44-
Log.Info(string.Format("Received {0}", message));
44+
Log.Debug(x => x("Message queue listener received {0}", message));
4545
if (IntegrationJobTypes != null && !IntegrationJobTypes.Any())
4646
continue;
4747
var type = IntegrationJobTypes.FirstOrDefault(t => t.FullName.Equals(message));

configuration/IntegrationEngine.nlog.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
<targets>
66
<target name="logfile" xsi:type="File" fileName="IntegrationEngine.log.txt" />
77
<target name="console" xsi:type="Console" />
8+
<target name="mailServer" xsi:type="Mail" to="ethanhann@gmail.com" from="ethanhann@gmail.com" />
89
</targets>
910

1011
<rules>
1112
<logger name="*" minlevel="Trace" writeTo="logfile" />
1213
<logger name="*" minlevel="Info" writeTo="console" />
14+
<logger name="*" minlevel="Error" writeTo="mailServer" />
1315
</rules>
1416
</nlog>

0 commit comments

Comments
 (0)