Skip to content

Commit e0c5ee9

Browse files
committed
Logging messages with data
1 parent b469b36 commit e0c5ee9

File tree

5 files changed

+25
-9
lines changed

5 files changed

+25
-9
lines changed

Eleven41.Logging.Loggly/Eleven41.Logging.Loggly.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="Eleven41.Logging">
35-
<HintPath>..\packages\Eleven41.Logging.1.1.1\Lib\net20\Eleven41.Logging.dll</HintPath>
34+
<Reference Include="Eleven41.Logging, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
35+
<SpecificVersion>False</SpecificVersion>
36+
<HintPath>..\packages\Eleven41.Logging.1.2.0\Lib\net20\Eleven41.Logging.dll</HintPath>
3637
</Reference>
3738
<Reference Include="Loggly">
3839
<HintPath>..\packages\loggly-csharp.2.5.1\lib\net40\Loggly.dll</HintPath>

Eleven41.Logging.Loggly/Eleven41.Logging.Loggly.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<package >
33
<metadata>
44
<id>Eleven41.Logging.Loggly</id>
5-
<version>1.0.0</version>
5+
<version>1.1.0</version>
66
<authors>Eleven41 Software</authors>
77
<owners>Eleven41 Software</owners>
88
<licenseUrl>https://github.com/eleven41/Eleven41.Logging.Loggly/blob/master/LICENSE.md</licenseUrl>
99
<projectUrl>https://github.com/eleven41/Eleven41.Logging.Loggly</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Eleven41.Logging.Loggly is an implementation of Eleven41.Logging.ILog to send log messages to Loggly.</description>
12-
<releaseNotes>Initial Revision</releaseNotes>
12+
<releaseNotes>Add support for logging messages with data.</releaseNotes>
1313
<copyright>Copyright (C) 2014, Eleven41 Software Inc.</copyright>
1414
<tags>logging loggly</tags>
1515
<dependencies>
16-
<dependency id="Eleven41.Logging" version="1.1.1" />
16+
<dependency id="Eleven41.Logging" version="1.2.0" />
1717
<dependency id="loggly-csharp" version="2.5.1" />
1818
<dependency id="Newtonsoft.Json" version="5.0.1" />
1919
</dependencies>

Eleven41.Logging.Loggly/LogglyLog.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,34 @@ public Dictionary<string, object> Data
8181
public bool IsSync { get; set; }
8282

8383
public void Log(LogLevels level, string sFormat, params object[] args)
84+
{
85+
// Call the data version
86+
Log(level, null, sFormat, args);
87+
}
88+
89+
public void Log(LogLevels level, Dictionary<string, object> messageData, string sFormat, params object[] args)
8490
{
8591
if (_logger == null)
8692
return;
8793

8894
// Start with the standard properties
8995
Dictionary<string, object> data = new Dictionary<string, object>(this.Data);
9096

97+
// Add the message data
98+
if (messageData != null)
99+
{
100+
foreach (var kvp in messageData)
101+
{
102+
data[kvp.Key] = kvp.Value;
103+
}
104+
}
105+
91106
// Add the new stuff for this message
92107
data["message"] = String.Format(sFormat, args);
93108
data["level"] = level.ToString();
94109
data["date"] = DateTime.UtcNow;
95110
data["thread"] = System.Threading.Thread.CurrentThread.GetHashCode();
96-
111+
97112
// Serialize and dispatch
98113
string json = Newtonsoft.Json.JsonConvert.SerializeObject(data);
99114
if (this.IsSync)

Eleven41.Logging.Loggly/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.1.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.0.0")]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Eleven41.Logging" version="1.1.1" targetFramework="net40" />
3+
<package id="Eleven41.Logging" version="1.2.0" targetFramework="net40" />
44
<package id="loggly-csharp" version="2.5.1" targetFramework="net40" />
55
<package id="Newtonsoft.Json" version="5.0.1" targetFramework="net40" />
66
</packages>

0 commit comments

Comments
 (0)