-
Notifications
You must be signed in to change notification settings - Fork 794
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from serilog/master
Merge from master
- Loading branch information
Showing
187 changed files
with
2,505 additions
and
373 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <startup> | ||
| <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/> | ||
| </startup> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{F9BEFBBD-0883-4AAF-AEEC-6172E890A713}</ProjectGuid> | ||
| <OutputType>Exe</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>MSSQLSample</RootNamespace> | ||
| <AssemblyName>MSSQLSample</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> | ||
| <TargetFrameworkProfile /> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="Program.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="App.config" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.FullNetFx\Serilog.FullNetFx.csproj"> | ||
| <Project>{7a9e1095-167d-402a-b43d-b36b97ff183d}</Project> | ||
| <Name>Serilog.FullNetFx</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj"> | ||
| <Project>{31c64be9-4ef6-42d5-a811-d7d24613eef6}</Project> | ||
| <Name>Serilog.Sinks.MSSqlServer</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Serilog\Serilog.csproj"> | ||
| <Project>{0915dbd9-0f7c-4439-8d9e-74c3d579b219}</Project> | ||
| <Name>Serilog</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Serilog; | ||
|
|
||
| namespace MSSQLSample | ||
| { | ||
| class Position | ||
| { | ||
| public double Lat { get; set; } | ||
| public double Long { get; set; } | ||
| } | ||
|
|
||
| class Program | ||
| { | ||
| static void Main() | ||
| { | ||
|
|
||
| Log.Logger = new LoggerConfiguration() | ||
| .WriteTo.ColoredConsole() | ||
| .MinimumLevel.Debug() | ||
| .WriteTo.MSSqlServer(@"Server=.\SQLEXPRESS;Database=LogEvents;Trusted_Connection=True;", "Logs") | ||
| .CreateLogger(); | ||
|
|
||
| Log.Verbose("This app, {ExeName}, demonstrates the basics of using Serilog", "Demo.exe"); | ||
|
|
||
| ProcessInput(new Position { Lat = 24.7, Long = 132.2 }); | ||
| ProcessInput(new Position { Lat = 24.71, Long = 132.15 }); | ||
| ProcessInput(new Position { Lat = 24.72, Long = 132.2 }); | ||
|
|
||
|
|
||
| Log.Information("Just biting {Fruit} number {Count}", "Apple", 12); | ||
| Log.ForContext<Program>().Information("Just biting {Fruit} number {Count:0000}", "Apple", 12); | ||
|
|
||
| // ReSharper disable CoVariantArrayConversion | ||
| Log.Information("I've eaten {Dinner}", new[] { "potatoes", "peas" }); | ||
| // ReSharper restore CoVariantArrayConversion | ||
|
|
||
| Log.Information("I sat at {@Chair}", new { Back = "straight", Legs = new[] { 1, 2, 3, 4 } }); | ||
| Log.Information("I sat at {Chair}", new { Back = "straight", Legs = new[] { 1, 2, 3, 4 } }); | ||
|
|
||
|
|
||
| const int failureCount = 3; | ||
| Log.Warning("Exception coming up because of {FailureCount} failures...", failureCount); | ||
|
|
||
|
|
||
|
|
||
| try | ||
| { | ||
| DoBad(); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Log.Error(ex, "There's those {FailureCount} failures", failureCount); | ||
| } | ||
|
|
||
| Log.Verbose("This app, {ExeName}, demonstrates the basics of using Serilog", "Demo.exe"); | ||
|
|
||
| try | ||
| { | ||
| DoBad(); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Log.Error(ex, "We did some bad work here."); | ||
| } | ||
|
|
||
| var result = 0; | ||
| var divideBy = 0; | ||
| try | ||
| { | ||
| result = 10 / divideBy; | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| Log.Error(e, "Unable to divide by {divideBy}", divideBy); | ||
| } | ||
|
|
||
|
|
||
| for (int i = 0; i < 10; i++) | ||
| { | ||
| Thread.Sleep(500); | ||
| Log.Debug("Count: {Counter}", i); | ||
| } | ||
|
|
||
| Log.Fatal("That's all folks - and all done using {WorkingSet} bytes of RAM", Environment.WorkingSet); | ||
| Console.ReadKey(true); | ||
| } | ||
|
|
||
| static void DoBad() | ||
| { | ||
| throw new InvalidOperationException("Everything's broken!"); | ||
| } | ||
|
|
||
| static readonly Random Rng = new Random(); | ||
|
|
||
| static void ProcessInput(Position sensorInput) | ||
| { | ||
| var sw = new Stopwatch(); | ||
| sw.Start(); | ||
| Log.Debug("Processing some input on {MachineName}...", Environment.MachineName); | ||
| Thread.Sleep(Rng.Next(0, 100)); | ||
| sw.Stop(); | ||
|
|
||
| Log.Information("Processed {@SensorInput} in {Time:000} ms", sensorInput, sw.ElapsedMilliseconds); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| // General Information about an assembly is controlled through the following | ||
| // set of attributes. Change these attribute values to modify the information | ||
| // associated with an assembly. | ||
| [assembly: AssemblyTitle("MSSQLSample")] | ||
| [assembly: AssemblyDescription("")] | ||
| [assembly: AssemblyConfiguration("")] | ||
| [assembly: AssemblyCompany("")] | ||
| [assembly: AssemblyProduct("MSSQLSample")] | ||
| [assembly: AssemblyCopyright("Copyright © 2014")] | ||
| [assembly: AssemblyTrademark("")] | ||
| [assembly: AssemblyCulture("")] | ||
|
|
||
| // Setting ComVisible to false makes the types in this assembly not visible | ||
| // to COM components. If you need to access a type in this assembly from | ||
| // COM, set the ComVisible attribute to true on that type. | ||
| [assembly: ComVisible(false)] | ||
|
|
||
| // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
| [assembly: Guid("5b9121fd-e0f6-4197-b2e9-d14b210d9c4e")] | ||
|
|
||
| // Version information for an assembly consists of the following four values: | ||
| // | ||
| // Major Version | ||
| // Minor Version | ||
| // Build Number | ||
| // Revision | ||
| // | ||
| // You can specify all the values or you can default the Build and Revision Numbers | ||
| // by using the '*' as shown below: | ||
| // [assembly: AssemblyVersion("1.0.*")] | ||
| [assembly: AssemblyVersion("1.0.0.0")] | ||
| [assembly: AssemblyFileVersion("1.0.0.0")] |
Oops, something went wrong.