Skip to content

Commit 3817e86

Browse files
DantharDanthar
authored
Merge pull request #16 from Danthar/master
Update for akka 1.1.1
2 parents 3555705 + 631c073 commit 3817e86

File tree

7 files changed

+48
-35
lines changed

7 files changed

+48
-35
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#### Akka.Logger.Serilog ####
22

3-
This is the Serilog integration plugin for Akka.NET. Please check out our [documentation](http://getakka.net/docs/Serilog) on how to get the most out of this plugin
3+
This is the Serilog integration plugin for Akka.NET. Please check out our [documentation](http://getakka.net/docs/Serilog) on how to get the most out of this plugin.
4+
5+
Targets Serilog 2.0.0

‎RELEASE_NOTES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### 1.1.1 Juli 16 2016 ####
2+
3+
Support for Akka 1.1.1
4+
Updated to Serilog 2.0.0
5+
16
#### 1.0.8 March 27 2016 ####
27

38
Support for Akka 1.0.8

‎src/.nuget/nuget.exe‎

2 KB
Binary file not shown.

‎src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,16 @@
3131
<DocumentationFile>bin\Release\Akka.Logger.Serilog.xml</DocumentationFile>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="Akka, Version=1.0.8.24, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\Akka.1.0.8\lib\net45\Akka.dll</HintPath>
34+
<Reference Include="Akka, Version=1.1.1.27, Culture=neutral, processorArchitecture=MSIL">
35+
<HintPath>..\packages\Akka.1.1.1\lib\net45\Akka.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3939
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
48-
<Private>True</Private>
42+
<Reference Include="Serilog">
43+
<HintPath>..\Packages\Serilog.2.0.0\lib\net45\Serilog.dll</HintPath>
4944
</Reference>
5045
<Reference Include="System" />
5146
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/Akka.Logger.Serilog/SerilogLogger.cs‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Akka.Event;
1111
using Serilog;
1212
using Akka.Dispatch;
13-
using Akka.Event;
1413

1514
namespace Akka.Logger.Serilog
1615
{
@@ -24,22 +23,6 @@ public class SerilogLogger : ReceiveActor, IRequiresMessageQueue<ILoggerMessageQ
2423
{
2524
private readonly ILoggingAdapter _log = Context.GetLogger();
2625

27-
private void WithSerilog(Action<ILogger> logStatement)
28-
{
29-
var logger = Log.Logger.ForContext("SourceContext", Context.Sender.Path);
30-
logStatement(logger);
31-
}
32-
33-
private ILogger SetContextFromLogEvent(ILogger logger, LogEvent logEvent)
34-
{
35-
logger = logger
36-
.ForContext("Timestamp", logEvent.Timestamp)
37-
.ForContext("LogSource", logEvent.LogSource)
38-
.ForContext("Thread", logEvent.Thread.ManagedThreadId.ToString().PadLeft(4, '0'));
39-
40-
return logger;
41-
}
42-
4326
private static string GetFormat(object message)
4427
{
4528
var logMessage = message as LogMessage;
@@ -58,15 +41,43 @@ private static object[] GetArgs(object message)
5841
: new[] { message };
5942
}
6043

44+
private static ILogger GetLogger(LogEvent logEvent) {
45+
var logger = Log.Logger.ForContext("SourceContext", Context.Sender.Path);
46+
logger = logger
47+
.ForContext("Timestamp", logEvent.Timestamp)
48+
.ForContext("LogSource", logEvent.LogSource)
49+
.ForContext("Thread", logEvent.Thread.ManagedThreadId.ToString().PadLeft(4, '0'));
50+
return logger;
51+
}
52+
53+
private static void Handle(Error logEvent) {
54+
55+
GetLogger(logEvent).Error(logEvent.Cause, GetFormat(logEvent.Message), GetArgs(logEvent.Message));
56+
}
57+
58+
private static void Handle(Warning logEvent) {
59+
GetLogger(logEvent).Warning(GetFormat(logEvent.Message), GetArgs(logEvent.Message));
60+
}
61+
62+
private static void Handle(Info logEvent)
63+
{
64+
GetLogger(logEvent).Information(GetFormat(logEvent.Message), GetArgs(logEvent.Message));
65+
}
66+
67+
private static void Handle(Debug logEvent)
68+
{
69+
GetLogger(logEvent).Debug(GetFormat(logEvent.Message), GetArgs(logEvent.Message));
70+
}
71+
6172
/// <summary>
6273
/// Initializes a new instance of the <see cref="SerilogLogger"/> class.
6374
/// </summary>
6475
public SerilogLogger()
6576
{
66-
Receive<Error>(m => WithSerilog(logger => SetContextFromLogEvent(logger, m).Error(m.Cause, GetFormat(m.Message), GetArgs(m.Message))));
67-
Receive<Warning>(m => WithSerilog(logger => SetContextFromLogEvent(logger, m).Warning(GetFormat(m.Message), GetArgs(m.Message))));
68-
Receive<Info>(m => WithSerilog(logger => SetContextFromLogEvent(logger, m).Information(GetFormat(m.Message), GetArgs(m.Message))));
69-
Receive<Debug>(m => WithSerilog(logger => SetContextFromLogEvent(logger, m).Debug(GetFormat(m.Message), GetArgs(m.Message))));
77+
Receive<Error>(m => Handle(m));
78+
Receive<Warning>(m => Handle(m));
79+
Receive<Info>(m => Handle(m));
80+
Receive<Debug>(m => Handle(m));
7081
Receive<InitializeLogger>(m =>
7182
{
7283
_log.Info("SerilogLogger started");

‎src/Akka.Logger.Serilog/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Akka" version="1.0.8" targetFramework="net45" />
3+
<package id="Akka" version="1.1.1" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
5-
<package id="Serilog" version="1.5.14" targetFramework="net45" />
5+
<package id="Serilog" version="2.0.0" targetFramework="net45" />
66
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
77
</packages>

‎src/SharedAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
[assembly: AssemblyCompanyAttribute("Akka.NET Team")]
55
[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")]
66
[assembly: AssemblyTrademarkAttribute("")]
7-
[assembly: AssemblyVersionAttribute("1.0.8.0")]
8-
[assembly: AssemblyFileVersionAttribute("1.0.8.0")]
7+
[assembly: AssemblyVersionAttribute("1.1.1.0")]
8+
[assembly: AssemblyFileVersionAttribute("1.1.1.0")]

0 commit comments

Comments
 (0)