From 36016f0368a851de68036223492e2c6f53383a29 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Mon, 12 Feb 2018 10:18:30 +1000 Subject: [PATCH 1/3] Include more shout-outs in Attribution/ --- src/SeqCli/Attribution/.NET Core License.txt | 23 +++++++++++++++++++ src/SeqCli/Attribution/Json.NET License.txt | 20 ++++++++++++++++ .../Attribution/System.Reactive License.txt | 14 +++++++++++ src/SeqCli/SeqCli.csproj | 5 +--- 4 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 src/SeqCli/Attribution/.NET Core License.txt create mode 100644 src/SeqCli/Attribution/Json.NET License.txt create mode 100644 src/SeqCli/Attribution/System.Reactive License.txt diff --git a/src/SeqCli/Attribution/.NET Core License.txt b/src/SeqCli/Attribution/.NET Core License.txt new file mode 100644 index 00000000..984713a4 --- /dev/null +++ b/src/SeqCli/Attribution/.NET Core License.txt @@ -0,0 +1,23 @@ +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/src/SeqCli/Attribution/Json.NET License.txt b/src/SeqCli/Attribution/Json.NET License.txt new file mode 100644 index 00000000..dfaadbe4 --- /dev/null +++ b/src/SeqCli/Attribution/Json.NET License.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/SeqCli/Attribution/System.Reactive License.txt b/src/SeqCli/Attribution/System.Reactive License.txt new file mode 100644 index 00000000..f4146fff --- /dev/null +++ b/src/SeqCli/Attribution/System.Reactive License.txt @@ -0,0 +1,14 @@ +Copyright (c) .NET Foundation and Contributors +All Rights Reserved + +Licensed under the Apache License, Version 2.0 (the "License"); you +may not use this file except in compliance with the License. You may +obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied. See the License for the specific language governing permissions +and limitations under the License. diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj index 1d398268..28818b4e 100644 --- a/src/SeqCli/SeqCli.csproj +++ b/src/SeqCli/SeqCli.csproj @@ -13,10 +13,7 @@ - - PreserveNewest - - + PreserveNewest From 14dc50e9433fb78831f5e16e81c6d7a1827e1463 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Mon, 12 Feb 2018 11:06:28 +1000 Subject: [PATCH 2/3] Tidy up tail output; output verbose error information (at least while the bugs are being shaken out) --- .../Cli/Features/OutputFormatFeature.cs | 4 ++- .../RedundantEventTypeRemovalEnricher.cs | 27 +++++++++++++++++++ src/SeqCli/Program.cs | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs diff --git a/src/SeqCli/Cli/Features/OutputFormatFeature.cs b/src/SeqCli/Cli/Features/OutputFormatFeature.cs index 297332db..267b53a5 100644 --- a/src/SeqCli/Cli/Features/OutputFormatFeature.cs +++ b/src/SeqCli/Cli/Features/OutputFormatFeature.cs @@ -13,6 +13,7 @@ // limitations under the License. using SeqCli.Config; +using SeqCli.Output; using Serilog; using Serilog.Core; using Serilog.Events; @@ -43,7 +44,8 @@ public override void Enable(OptionSet options) public Logger CreateOutputLogger() { var outputConfiguration = new LoggerConfiguration() - .MinimumLevel.Is(LevelAlias.Minimum); + .MinimumLevel.Is(LevelAlias.Minimum) + .Enrich.With(); if (_json) outputConfiguration.WriteTo.Console(new CompactJsonFormatter()); diff --git a/src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs b/src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs new file mode 100644 index 00000000..fbd89010 --- /dev/null +++ b/src/SeqCli/Output/RedundantEventTypeRemovalEnricher.cs @@ -0,0 +1,27 @@ +// Copyright 2018 Datalust Pty Ltd +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using Serilog.Core; +using Serilog.Events; + +namespace SeqCli.Output +{ + public class RedundantEventTypeRemovalEnricher : ILogEventEnricher + { + public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory) + { + logEvent.RemovePropertyIfPresent("@i"); + } + } +} diff --git a/src/SeqCli/Program.cs b/src/SeqCli/Program.cs index dd8c309d..668db97c 100644 --- a/src/SeqCli/Program.cs +++ b/src/SeqCli/Program.cs @@ -28,7 +28,7 @@ static async Task Main(string[] args) Log.Logger = new LoggerConfiguration() .MinimumLevel.Error() .WriteTo.Console( - outputTemplate: "{Message:lj}{NewLine}", + outputTemplate: "{Message:lj}{NewLine}{Exception}", standardErrorFromLevel: LevelAlias.Minimum) .CreateLogger(); From 932643a68a33860b2ade56820d61b56c03b2bd1f Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Mon, 12 Feb 2018 13:10:28 +1000 Subject: [PATCH 3/3] Remove ILLink - seeing errors in published binaries when lazy-initializing platform types --- nuget.config | 8 -------- seqcli.sln | 1 - src/SeqCli/SeqCli.csproj | 1 - 3 files changed, 10 deletions(-) delete mode 100644 nuget.config diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 5645e58e..00000000 --- a/nuget.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/seqcli.sln b/seqcli.sln index d0721e8b..d1af2409 100644 --- a/seqcli.sln +++ b/seqcli.sln @@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{2EA56595-519 appveyor.yml = appveyor.yml Build.ps1 = Build.ps1 LICENSE = LICENSE - nuget.config = nuget.config README.md = README.md EndProjectSection EndProject diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj index 1d398268..32fa061e 100644 --- a/src/SeqCli/SeqCli.csproj +++ b/src/SeqCli/SeqCli.csproj @@ -28,7 +28,6 @@ -