Skip to content

Commit 38acedb

Browse files
wwwliciouswwwlicious
committed
Merge pull request #4 from rsafier/master
Use JsConfigScope to prevent global EmitCamelCaseNames from causing invalid raw posts to Seq.
2 parents 5d73eae + c4b1a8c commit 38acedb

File tree

5 files changed

+57
-51
lines changed

5 files changed

+57
-51
lines changed

‎src/ServiceStack.Seq.RequestLogsFeature/SeqRequestLogger.cs

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Threading;
88

99
using ServiceStack.Web;
10+
using ServiceStack.Text;
1011

1112
public class SeqRequestLogger : IRequestLogger
1213
{
@@ -50,10 +51,13 @@ public void Log(IRequest request, object requestDto, object response, TimeSpan r
5051
// TODO inefficient as uses 1 event : 1 http post to seq
5152
// replace with something to buffer/queue and
5253
// batch entries for posting
53-
"{0}/api/events/raw".Fmt(seqUrl)
54-
.PostJsonToUrlAsync(
55-
new SeqLogRequest(entry),
56-
webRequest => webRequest.Headers.Add("X-Seq-ApiKey", apiKey));
54+
using (var scope = JsConfig.With(emitCamelCaseNames: false))
55+
{
56+
"{0}/api/events/raw".Fmt(seqUrl)
57+
.PostJsonToUrlAsync(
58+
new SeqLogRequest(entry),
59+
webRequest => webRequest.Headers.Add("X-Seq-ApiKey", apiKey));
60+
}
5761
}
5862

5963
protected SeqRequestLogEntry CreateEntry(

‎src/ServiceStack.Seq.RequestLogsFeature/ServiceStack.Seq.RequestLogsFeature.csproj

+18-16
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,36 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="ServiceStack, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\..\packages\ServiceStack.4.0.46\lib\net40\ServiceStack.dll</HintPath>
34+
<Reference Include="ServiceStack, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
35+
<HintPath>..\..\packages\ServiceStack.4.0.50\lib\net40\ServiceStack.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
38-
<Reference Include="ServiceStack.Client, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\ServiceStack.Client.4.0.46\lib\net40\ServiceStack.Client.dll</HintPath>
38+
<Reference Include="ServiceStack.Client, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\ServiceStack.Client.4.0.50\lib\net40\ServiceStack.Client.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="ServiceStack.Common, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\ServiceStack.Common.4.0.46\lib\net40\ServiceStack.Common.dll</HintPath>
42+
<Reference Include="ServiceStack.Common, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\ServiceStack.Common.4.0.50\lib\net40\ServiceStack.Common.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\ServiceStack.Interfaces.4.0.46\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
47+
<HintPath>..\..\packages\ServiceStack.Interfaces.4.0.50\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="ServiceStack.OrmLite, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\ServiceStack.OrmLite.4.0.46\lib\net45\ServiceStack.OrmLite.dll</HintPath>
50+
<Reference Include="ServiceStack.OrmLite, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\ServiceStack.OrmLite.4.0.50\lib\net45\ServiceStack.OrmLite.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.4.0.46\lib\net45\ServiceStack.OrmLite.SqlServer.dll</HintPath>
54+
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.4.0.50\lib\net45\ServiceStack.OrmLite.SqlServer.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
58-
<Reference Include="ServiceStack.Redis, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\ServiceStack.Redis.4.0.46\lib\net40\ServiceStack.Redis.dll</HintPath>
58+
<Reference Include="ServiceStack.Redis, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\ServiceStack.Redis.4.0.50\lib\net40\ServiceStack.Redis.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="ServiceStack.Text, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\ServiceStack.Text.4.0.46\lib\net40\ServiceStack.Text.dll</HintPath>
62+
<Reference Include="ServiceStack.Text, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\ServiceStack.Text.4.0.50\lib\net40\ServiceStack.Text.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="System" />
@@ -78,7 +78,9 @@
7878
<Compile Include="SeqRequestLogger.cs" />
7979
</ItemGroup>
8080
<ItemGroup>
81-
<None Include="packages.config" />
81+
<None Include="packages.config">
82+
<SubType>Designer</SubType>
83+
</None>
8284
<None Include="ServiceStack.Seq.RequestLogsFeature.nuspec">
8385
<SubType>Designer</SubType>
8486
</None>

‎src/ServiceStack.Seq.RequestLogsFeature/packages.config

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack" version="4.0.46" targetFramework="net45" />
4-
<package id="ServiceStack.Client" version="4.0.46" targetFramework="net45" />
5-
<package id="ServiceStack.Common" version="4.0.46" targetFramework="net45" />
6-
<package id="ServiceStack.Interfaces" version="4.0.46" targetFramework="net45" />
7-
<package id="ServiceStack.OrmLite" version="4.0.46" targetFramework="net45" />
8-
<package id="ServiceStack.OrmLite.SqlServer" version="4.0.46" targetFramework="net45" />
9-
<package id="ServiceStack.Redis" version="4.0.46" targetFramework="net45" />
10-
<package id="ServiceStack.Text" version="4.0.46" targetFramework="net45" />
3+
<package id="ServiceStack" version="4.0.50" targetFramework="net45" />
4+
<package id="ServiceStack.Client" version="4.0.50" targetFramework="net45" />
5+
<package id="ServiceStack.Common" version="4.0.50" targetFramework="net45" />
6+
<package id="ServiceStack.Interfaces" version="4.0.50" targetFramework="net45" />
7+
<package id="ServiceStack.OrmLite" version="4.0.50" targetFramework="net45" />
8+
<package id="ServiceStack.OrmLite.SqlServer" version="4.0.50" targetFramework="net45" />
9+
<package id="ServiceStack.Redis" version="4.0.50" targetFramework="net45" />
10+
<package id="ServiceStack.Text" version="4.0.50" targetFramework="net45" />
1111
</packages>

‎test/ConsoleDemo/ConsoleDemo.csproj

+15-15
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,36 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="ServiceStack, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\ServiceStack.4.0.46\lib\net40\ServiceStack.dll</HintPath>
37+
<Reference Include="ServiceStack, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\ServiceStack.4.0.50\lib\net40\ServiceStack.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="ServiceStack.Client, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\ServiceStack.Client.4.0.46\lib\net40\ServiceStack.Client.dll</HintPath>
41+
<Reference Include="ServiceStack.Client, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\ServiceStack.Client.4.0.50\lib\net40\ServiceStack.Client.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="ServiceStack.Common, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\ServiceStack.Common.4.0.46\lib\net40\ServiceStack.Common.dll</HintPath>
45+
<Reference Include="ServiceStack.Common, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\ServiceStack.Common.4.0.50\lib\net40\ServiceStack.Common.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\ServiceStack.Interfaces.4.0.46\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
50+
<HintPath>..\..\packages\ServiceStack.Interfaces.4.0.50\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="ServiceStack.OrmLite, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\ServiceStack.OrmLite.4.0.46\lib\net45\ServiceStack.OrmLite.dll</HintPath>
53+
<Reference Include="ServiceStack.OrmLite, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\..\packages\ServiceStack.OrmLite.4.0.50\lib\net45\ServiceStack.OrmLite.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
57-
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.4.0.46\lib\net45\ServiceStack.OrmLite.SqlServer.dll</HintPath>
57+
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.4.0.50\lib\net45\ServiceStack.OrmLite.SqlServer.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
61-
<Reference Include="ServiceStack.Redis, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\ServiceStack.Redis.4.0.46\lib\net40\ServiceStack.Redis.dll</HintPath>
61+
<Reference Include="ServiceStack.Redis, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
62+
<HintPath>..\..\packages\ServiceStack.Redis.4.0.50\lib\net40\ServiceStack.Redis.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="ServiceStack.Text, Version=4.0.46.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\ServiceStack.Text.4.0.46\lib\net40\ServiceStack.Text.dll</HintPath>
65+
<Reference Include="ServiceStack.Text, Version=4.0.50.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\ServiceStack.Text.4.0.50\lib\net40\ServiceStack.Text.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="System" />

‎test/ConsoleDemo/packages.config

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack" version="4.0.46" targetFramework="net45" />
4-
<package id="ServiceStack.Client" version="4.0.46" targetFramework="net45" />
5-
<package id="ServiceStack.Common" version="4.0.46" targetFramework="net45" />
6-
<package id="ServiceStack.Interfaces" version="4.0.46" targetFramework="net45" />
7-
<package id="ServiceStack.OrmLite" version="4.0.46" targetFramework="net45" />
8-
<package id="ServiceStack.OrmLite.SqlServer" version="4.0.46" targetFramework="net45" />
9-
<package id="ServiceStack.Redis" version="4.0.46" targetFramework="net45" />
10-
<package id="ServiceStack.Text" version="4.0.46" targetFramework="net45" />
3+
<package id="ServiceStack" version="4.0.50" targetFramework="net45" />
4+
<package id="ServiceStack.Client" version="4.0.50" targetFramework="net45" />
5+
<package id="ServiceStack.Common" version="4.0.50" targetFramework="net45" />
6+
<package id="ServiceStack.Interfaces" version="4.0.50" targetFramework="net45" />
7+
<package id="ServiceStack.OrmLite" version="4.0.50" targetFramework="net45" />
8+
<package id="ServiceStack.OrmLite.SqlServer" version="4.0.50" targetFramework="net45" />
9+
<package id="ServiceStack.Redis" version="4.0.50" targetFramework="net45" />
10+
<package id="ServiceStack.Text" version="4.0.50" targetFramework="net45" />
1111
</packages>

0 commit comments

Comments
 (0)